diff --git a/.travis.yml b/.travis.yml index 5d87a79..93cb67b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,21 +5,19 @@ sudo: false python: - "3.6" - "3.7" + - "3.8" env: matrix: - - DJANGO=2.0 - - DJANGO=2.1 - DJANGO=2.2 + - DJANGO=3.0 + - DJANGO=3.1 - DJANGO=master addons: postgresql: '9.6' matrix: - exclude: - - { python: "3.7", env: DJANGO=2.0 } - include: - { python: "3.6", env: TOXENV=flake8 } diff --git a/docs/release_notes.rst b/docs/release_notes.rst index 45905a7..0f07c24 100644 --- a/docs/release_notes.rst +++ b/docs/release_notes.rst @@ -1,6 +1,11 @@ Release Notes ============= +v2.0.0 +------ +* Support django 2.2, 3.0, 3.1 only +* Support python 3.6, 3.7, 3.8 only + v1.4.0 ------ * Only support django >= 2.0 and python >= 3.6 diff --git a/manager_utils/version.py b/manager_utils/version.py index 96e3ce8..afced14 100644 --- a/manager_utils/version.py +++ b/manager_utils/version.py @@ -1 +1 @@ -__version__ = '1.4.0' +__version__ = '2.0.0' diff --git a/requirements/requirements-testing.txt b/requirements/requirements-testing.txt index 5cf34af..e69e98f 100644 --- a/requirements/requirements-testing.txt +++ b/requirements/requirements-testing.txt @@ -6,3 +6,4 @@ django-dynamic-fixture pytz django-timezone-field parameterized +freezegun diff --git a/setup.py b/setup.py index 4b41226..c5d046b 100644 --- a/setup.py +++ b/setup.py @@ -29,19 +29,19 @@ def get_version(): classifiers=[ 'Programming Language :: Python', 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.4', - 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Operating System :: OS Independent', - 'Framework :: Django :: 1.10', - 'Framework :: Django :: 1.11', - 'Framework :: Django :: 2.0', + 'Framework :: Django :: 2.2', + 'Framework :: Django :: 3.0', + 'Framework :: Django :: 3.1', ], install_requires=[ - 'Django>=1.10', - 'django-query-builder>=1.1.0', + 'Django>=2.2', + 'django-query-builder>=2.0.0', ], tests_require=[ 'coverage', diff --git a/tox.ini b/tox.ini index 13ff864..77d6894 100644 --- a/tox.ini +++ b/tox.ini @@ -1,18 +1,18 @@ [tox] envlist = flake8 - py{36}-django20 - py{36,37}-django21 py{36,37}-django22 - py{36,37}-djangomaster + py{36,37,38}-django30 + py{36,37,38}-django31 + py{36,37,38}-djangomaster [testenv] setenv = DB = postgres deps = - django20: Django>=2.0,<2.1 - django21: Django>=2.1,<2.2 - django22: Django>=2.2,<2.3 + django22: Django>=2.2,<3.0 + django30: Django>=3.0,<3.1 + django31: Django>=3.1,<3.2 djangomaster: https://github.com/django/django/archive/master.tar.gz -rrequirements/requirements-testing.txt commands = @@ -26,7 +26,7 @@ commands = flake8 manager_utils [travis:env] DJANGO = - 2.0: django20 - 2.1: django21 2.2: django22 + 3.0: django30 + 3.1: django31 master: djangomaster