diff --git a/.travis.yml b/.travis.yml index 5a682ed..dcbb7a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,18 +8,15 @@ python: 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/db_mutex/version.py b/db_mutex/version.py index 58d478a..afced14 100644 --- a/db_mutex/version.py +++ b/db_mutex/version.py @@ -1 +1 @@ -__version__ = '1.2.0' +__version__ = '2.0.0' diff --git a/docs/release_notes.rst b/docs/release_notes.rst index 0b130e8..619d27c 100644 --- a/docs/release_notes.rst +++ b/docs/release_notes.rst @@ -1,6 +1,11 @@ Release Notes ============= +v2.0.0 +------ +* Django 3.0, 3.1 +* Drop Django 2.0, 2.1 + v1.2.0 ------ * Python 3.7 diff --git a/setup.py b/setup.py index 284af79..233ce7b 100644 --- a/setup.py +++ b/setup.py @@ -36,13 +36,13 @@ def get_version(): 'License :: OSI Approved :: MIT License', 'Operating System :: OS Independent', 'Framework :: Django', - 'Framework :: Django :: 2.0', - 'Framework :: Django :: 2.1', 'Framework :: Django :: 2.2', + 'Framework :: Django :: 3.0', + 'Framework :: Django :: 3.1', ], license='MIT', install_requires=[ - 'Django>=2.0', + 'Django>=2.2', ], tests_require=[ 'psycopg2', diff --git a/tox.ini b/tox.ini index be84776..b4f7ebd 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}-django30 + py{36,37}-django31 py{36,37}-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 = @@ -25,7 +25,7 @@ commands = flake8 db_mutex [travis:env] DJANGO = - 2.0: django20 - 2.1: django21 2.2: django22 + 3.0: django30 + 3.1: django31 master: djangomaster