From ecad161c2afec3c604a1497af08994b191e918c9 Mon Sep 17 00:00:00 2001 From: Wes Okes Date: Wed, 10 Jul 2019 19:45:23 -0400 Subject: [PATCH 1/3] version support --- .travis.yml | 21 ++++++++------------- db_mutex/version.py | 2 +- docs/release_notes.rst | 6 ++++++ setup.py | 9 ++++----- tox.ini | 12 ++++++------ 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index d644966..5a682ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,33 +1,28 @@ +dist: xenial language: python - sudo: false python: - - "2.7" - - "3.4" - - "3.5" - "3.6" + - "3.7" env: matrix: - - DJANGO=1.10 - - DJANGO=1.11 - DJANGO=2.0 + - DJANGO=2.1 + - DJANGO=2.2 - DJANGO=master addons: - postgresql: '9.5' + postgresql: '9.6' matrix: + exclude: + - { python: "3.7", env: DJANGO=2.0 } + include: - { python: "3.6", env: TOXENV=flake8 } - exclude: - - { python: "2.7", env: DJANGO=master } - - { python: "2.7", env: DJANGO=2.0 } - - { python: "3.4", env: DJANGO=master } - - { python: "3.6", env: DJANGO=1.10 } - allow_failures: - env: DJANGO=master diff --git a/db_mutex/version.py b/db_mutex/version.py index 1a72d32..58d478a 100644 --- a/db_mutex/version.py +++ b/db_mutex/version.py @@ -1 +1 @@ -__version__ = '1.1.0' +__version__ = '1.2.0' diff --git a/docs/release_notes.rst b/docs/release_notes.rst index 91a154c..0b130e8 100644 --- a/docs/release_notes.rst +++ b/docs/release_notes.rst @@ -1,6 +1,12 @@ Release Notes ============= +v1.2.0 +------ +* Python 3.7 +* Django 2.1 +* Django 2.2 + v1.1.0 ------ * Add tox to support more versions diff --git a/setup.py b/setup.py index 6d792a8..292954e 100644 --- a/setup.py +++ b/setup.py @@ -30,21 +30,20 @@ def get_version(): packages=find_packages(), 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', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Operating System :: OS Independent', 'Framework :: Django', - 'Framework :: Django :: 1.10', 'Framework :: Django :: 1.11', 'Framework :: Django :: 2.0', + 'Framework :: Django :: 2.1', + 'Framework :: Django :: 2.2', ], license='MIT', install_requires=[ - 'Django>=1.10', + 'Django>=1.11', ], tests_require=[ 'psycopg2', diff --git a/tox.ini b/tox.ini index ac616ad..22c5c39 100644 --- a/tox.ini +++ b/tox.ini @@ -1,18 +1,18 @@ [tox] envlist = flake8 - py{27,34,35}-django110 - py{27,34,35,36}-django111 - py{34,35,36}-django20 - py{35,36}-djangomaster + py{36}-django20 + py{36,37}-django21 + py{36,37}-django22 + py{36,37}-djangomaster [testenv] setenv = DB = postgres deps = - django110: Django>=1.10,<1.11 - django111: Django>=1.11,<2.0 django20: Django>=2.0,<2.1 + django21: Django>=2.1,<2.2 + django22: Django>=2.2,<2.3 djangomaster: https://github.com/django/django/archive/master.tar.gz -rrequirements/requirements-testing.txt commands = From 28d580884881528eee3409e2b454100d82607ff6 Mon Sep 17 00:00:00 2001 From: Wes Okes Date: Thu, 11 Jul 2019 13:36:10 -0400 Subject: [PATCH 2/3] env --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 22c5c39..be84776 100644 --- a/tox.ini +++ b/tox.ini @@ -25,7 +25,7 @@ commands = flake8 db_mutex [travis:env] DJANGO = - 1.10: django110 - 1.11: django111 2.0: django20 + 2.1: django21 + 2.2: django22 master: djangomaster From fcea8734cc46aef2c7c17b504996da9ab8e2bd2a Mon Sep 17 00:00:00 2001 From: Wes Okes Date: Thu, 11 Jul 2019 14:30:18 -0400 Subject: [PATCH 3/3] requirements --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 292954e..284af79 100644 --- a/setup.py +++ b/setup.py @@ -36,14 +36,13 @@ def get_version(): 'License :: OSI Approved :: MIT License', 'Operating System :: OS Independent', 'Framework :: Django', - 'Framework :: Django :: 1.11', 'Framework :: Django :: 2.0', 'Framework :: Django :: 2.1', 'Framework :: Django :: 2.2', ], license='MIT', install_requires=[ - 'Django>=1.11', + 'Django>=2.0', ], tests_require=[ 'psycopg2',