Skip to content

Commit

Permalink
Prepare 0.2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
silentsokolov committed Apr 23, 2018
1 parent bc2fd13 commit 4e460a8
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 15 deletions.
13 changes: 9 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,20 @@ python:
- 3.3
- 3.4
- 3.5
- 3.6

install:
- pip install Django${DJANGO_VERSION}
- pip install codecov
- pip install pytz

env:
matrix:
- DJANGO_VERSION=">=1.8,<1.9"
- DJANGO_VERSION=">=1.9,<1.10"
- DJANGO_VERSION=">=1.10,<1.11"
- DJANGO_VERSION=">=1.11,<2.0.0"
- DJANGO_VERSION=">=1.11,<2.0"
- DJANGO_VERSION=">=2.0,<2.1"

matrix:
exclude:
Expand All @@ -25,9 +28,11 @@ matrix:
- python: 3.3
env: DJANGO_VERSION=">=1.10,<1.11"
- python: 3.3
env: DJANGO_VERSION=">=1.11,<2.0.0"
- python: 3.4
env: DJANGO_VERSION=">=1.11,<2.0.0"
env: DJANGO_VERSION=">=1.11,<2.0"
- python: 3.3
env: DJANGO_VERSION=">=2.0,<2.1"
- python: 2.7
env: DJANGO_VERSION=">=2.0,<2.1"

branches:
only:
Expand Down
5 changes: 4 additions & 1 deletion CHANGES
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
0.2.4 (2017-05-30)
0.2.6 (2018-04-23)
- Django 2.0 support

0.2.5 (2017-05-30)
- Django 1.11 support

0.2.4 (2016-01-02)
Expand Down
3 changes: 1 addition & 2 deletions runtests.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@

import django

from django.conf import settings, global_settings
from django.conf import settings
from django.core.management import call_command


settings.configure(
MIDDLEWARE_CLASSES=global_settings.MIDDLEWARE_CLASSES,
INSTALLED_APPS=(
'django.contrib.auth',
'django.contrib.contenttypes',
Expand Down
19 changes: 13 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import os
import re
from os.path import join, dirname
from setuptools import setup


Expand Down Expand Up @@ -33,26 +34,32 @@ def get_package_data(package):
version=get_version('treasuremap'),
url='https://github.com/silentsokolov/django-treasuremap',
license='MIT',
author='Dmitriy Sokolov',
author_email='silentsokolov@gmail.com',
description='django-treasuremap app, makes it easy to store and display '
'the location on the map using different providers (Google, Yandex).',
zip_safe=False,
include_package_data=True,
platforms='any',
long_description=open(join(dirname(__file__), 'README.rst')).read(),
author='Dmitriy Sokolov',
author_email='silentsokolov@gmail.com',
packages=get_packages('treasuremap'),
package_data=get_package_data('treasuremap'),
include_package_data=True,
install_requires=[],
python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
zip_safe=False,
platforms='any',
classifiers=[
'Development Status :: 4 - Beta',
'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment',
'Framework :: Django',
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Topic :: Utilities',
],
)
2 changes: 1 addition & 1 deletion treasuremap/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@


__author__ = 'Dmitriy Sokolov'
__version__ = '0.2.5'
__version__ = '0.2.6'


default_app_config = 'treasuremap.apps.TreasureMapConfig'
Expand Down
1 change: 0 additions & 1 deletion treasuremap/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
from decimal import Decimal, InvalidOperation

from django import VERSION as DJANGO_VERSION

from django.core.exceptions import ValidationError, ImproperlyConfigured
from django.test.utils import override_settings
from django.test import TestCase
Expand Down

0 comments on commit 4e460a8

Please sign in to comment.