From 5f0c2418f7da0828e8b1ccb9cd6ecc8bf40810f4 Mon Sep 17 00:00:00 2001 From: John Whitlock Date: Tue, 2 Oct 2018 20:13:57 -0500 Subject: [PATCH 1/5] Update notes for Django, Python support * Add Python 3.4 support in Django 2.0 * Add Django classifiers * Add notes about Python 3.7 --- README.rst | 4 +++- setup.py | 6 ++++++ tox.ini | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index ee52014..ef2eb3a 100644 --- a/README.rst +++ b/README.rst @@ -46,7 +46,9 @@ recommended. It follows the `Django's support policy`_, supporting: * Django 1.9 with Python 2.7, 3.4, or 3.5 * Django 1.10 with Python 2.7, 3.4, or 3.5 * Django 1.11 (LTS) with Python 2.7, 3.4, 3.5, or 3.6 -* Django 2.0 with Python 3.5 or 3.6 +* Django 2.0 with Python 3.4, 3.5 or 3.6 + +Python 3.7 should work, but is untested in TravisCI. .. _latest release: https://pypi.python.org/pypi/nose .. _Django's support policy: https://docs.djangoproject.com/en/1.8/internals/release-process/#supported-versions diff --git a/setup.py b/setup.py index d02e383..d3183c8 100644 --- a/setup.py +++ b/setup.py @@ -66,6 +66,11 @@ def get_long_description(title): 'Development Status :: 5 - Production/Stable', 'Environment :: Web Environment', 'Framework :: Django', + 'Framework :: Django :: 1.8', + 'Framework :: Django :: 1.9', + 'Framework :: Django :: 1.10', + 'Framework :: Django :: 1.11', + 'Framework :: Django :: 2.0', 'Intended Audience :: Developers', 'License :: OSI Approved :: BSD License', 'Operating System :: OS Independent', @@ -76,6 +81,7 @@ def get_long_description(title): 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', 'Topic :: Software Development :: Testing' ] ) diff --git a/tox.ini b/tox.ini index 15e98b0..599f2af 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ envlist = py{27,34,35}-django-{18,19,110}{,-postgres,-mysql} py{27,34,35,36}-django-111{,-postgres,-mysql} - py{35,36}-django-{20,master}{,-postgres,-mysql} + py{34,35,36}-django-{20,master}{,-postgres,-mysql} flake8 docs skip_missing_interpreters = True From 36a02ab4564b4884a68e0e198b2869871ced4411 Mon Sep 17 00:00:00 2001 From: John Whitlock Date: Tue, 2 Oct 2018 21:49:51 -0500 Subject: [PATCH 2/5] Add Django 2.1 to test matrix --- .travis.yml | 20 ++++++++++++++++---- README.rst | 1 + setup.py | 1 + tox.ini | 4 +++- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f1faa59..4c216f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,10 @@ matrix: - env: TOXENV=docs python: "3.5" # Supported Python / Django versions w/ SQLite + - env: TOXENV=py35-django-21 + python: "3.5" + - env: TOXENV=py36-django-21 + python: "3.6" - env: TOXENV=py35-django-20 python: "3.5" - env: TOXENV=py36-django-20 @@ -32,9 +36,13 @@ matrix: - env: TOXENV=py34-django-18 python: "3.4" # Test with PostgreSQL - - env: TOXENV=py35-django-20-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-111-postgres" + - env: TOXENV=py35-django-21-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-21-postgres" + python: "3.5" + - env: TOXENV=py36-django-21-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-21-postgres" + python: "3.6" + - env: TOXENV=py35-django-20-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-20-postgres" python: "3.5" - - env: TOXENV=py36-django-20-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-111-postgres" + - env: TOXENV=py36-django-20-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-20-postgres" python: "3.6" - env: TOXENV=py27-django-111-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-111-postgres" python: "2.7" @@ -51,9 +59,13 @@ matrix: - env: TOXENV=py27-django-18-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-18-postgres" python: "2.7" # Test with MySQL - - env: TOXENV=py35-django-20-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-111-mysql" + - env: TOXENV=py35-django-21-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-21-mysql" + python: "3.5" + - env: TOXENV=py36-django-21-mysql DATABASE_URL="mysql://travis@localhost:3306/py36-django-21-mysql" + python: "3.6" + - env: TOXENV=py35-django-20-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-20-mysql" python: "3.5" - - env: TOXENV=py36-django-20-mysql DATABASE_URL="mysql://travis@localhost:3306/py36-django-111-mysql" + - env: TOXENV=py36-django-20-mysql DATABASE_URL="mysql://travis@localhost:3306/py36-django-20-mysql" python: "3.6" - env: TOXENV=py27-django-111-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-111-mysql" python: "2.7" diff --git a/README.rst b/README.rst index ef2eb3a..93d9ded 100644 --- a/README.rst +++ b/README.rst @@ -47,6 +47,7 @@ recommended. It follows the `Django's support policy`_, supporting: * Django 1.10 with Python 2.7, 3.4, or 3.5 * Django 1.11 (LTS) with Python 2.7, 3.4, 3.5, or 3.6 * Django 2.0 with Python 3.4, 3.5 or 3.6 +* Django 2.1 with Python 3.5 or 3.6 Python 3.7 should work, but is untested in TravisCI. diff --git a/setup.py b/setup.py index d3183c8..3f8a679 100644 --- a/setup.py +++ b/setup.py @@ -71,6 +71,7 @@ def get_long_description(title): 'Framework :: Django :: 1.10', 'Framework :: Django :: 1.11', 'Framework :: Django :: 2.0', + 'Framework :: Django :: 2.1', 'Intended Audience :: Developers', 'License :: OSI Approved :: BSD License', 'Operating System :: OS Independent', diff --git a/tox.ini b/tox.ini index 599f2af..2885f42 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,8 @@ envlist = py{27,34,35}-django-{18,19,110}{,-postgres,-mysql} py{27,34,35,36}-django-111{,-postgres,-mysql} - py{34,35,36}-django-{20,master}{,-postgres,-mysql} + py{34,35,36,37}-django-20{,-postgres,-mysql} + py{35,36,37}-django-{21,master}{,-postgres,-mysql} flake8 docs skip_missing_interpreters = True @@ -20,6 +21,7 @@ deps = django-110: Django>=1.10,<1.11 django-111: Django>=1.11,<2.0 django-20: Django>=2.0,<2.1 + django-21: Django>=2.1,<2.2 django-master: https://github.com/django/django/archive/master.tar.gz postgres: psycopg2 mysql: mysqlclient From 0b45421d7d6c429c9339c58df58a5dd117063be5 Mon Sep 17 00:00:00 2001 From: John Whitlock Date: Wed, 3 Oct 2018 10:00:10 -0500 Subject: [PATCH 3/5] Release 1.4.6: Django 2.0 and 2.1 support --- changelog.rst | 4 ++++ django_nose/__init__.py | 2 +- setup.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changelog.rst b/changelog.rst index 8e63182..4740637 100644 --- a/changelog.rst +++ b/changelog.rst @@ -1,6 +1,10 @@ Changelog --------- +1.4.6 (2018-10-03) +~~~~~~~~~~~~~~~~~~ +* Document Django 2.0 and 2.1 support. No library changes needed. + 1.4.5 (2017-08-22) ~~~~~~~~~~~~~~~~~~ * Add Django 1.11 support diff --git a/django_nose/__init__.py b/django_nose/__init__.py index beda667..e84755a 100644 --- a/django_nose/__init__.py +++ b/django_nose/__init__.py @@ -8,5 +8,5 @@ assert NoseTestSuiteRunner assert FastFixtureTestCase -VERSION = (1, 4, 5) +VERSION = (1, 4, 6) __version__ = '.'.join(map(str, VERSION)) diff --git a/setup.py b/setup.py index 3f8a679..9331542 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ def get_long_description(title): setup( name='django-nose', - version='1.4.5', + version='1.4.6', description='Makes your Django tests simple and snappy', long_description=get_long_description('django-nose'), author='Jeff Balogh', From 58f48f70dd89bb7be701ea2bcf6473a375f826ca Mon Sep 17 00:00:00 2001 From: John Whitlock Date: Wed, 3 Oct 2018 10:14:14 -0500 Subject: [PATCH 4/5] Try Python 3.7 Python 3.7 isn't supported in the standard Python containers yet. Use the 'xenial' dist to include Python 3.7. --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4c216f6..a09e18e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,14 +86,20 @@ matrix: python: "3.5" - env: TOXENV=py36-django-master python: "3.6" + - env: TOXENV=py37-django-master + python: "3.7" + sudo: required + dist: xenial - env: TOXENV=py35-django-master-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-master-mysql" python: "3.5" + language: pyth - env: TOXENV=py36-django-master-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-master-postgres" python: "3.6" allow_failures: # Master is allowed to fail - env: TOXENV=py35-django-master - env: TOXENV=py36-django-master + - env: TOXENV=py37-django-master - env: TOXENV=py35-django-master-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-master-mysql" - env: TOXENV=py36-django-master-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-master-postgres" From b27b7feaa7003e227eb92fd2e10cadf12d2a3824 Mon Sep 17 00:00:00 2001 From: John Whitlock Date: Wed, 3 Oct 2018 14:28:55 -0500 Subject: [PATCH 5/5] Add Python 3.7 to the test matrix Use xenial dist and sudo for the Python 3.7 builds. --- .travis.yml | 12 ++++++++++++ README.rst | 6 ++---- setup.py | 1 + 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a09e18e..7df6b50 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,10 @@ matrix: python: "3.5" - env: TOXENV=py36-django-21 python: "3.6" + - env: TOXENV=py37-django-21 + python: "3.7" + sudo: required + dist: xenial - env: TOXENV=py35-django-20 python: "3.5" - env: TOXENV=py36-django-20 @@ -40,10 +44,18 @@ matrix: python: "3.5" - env: TOXENV=py36-django-21-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-21-postgres" python: "3.6" + - env: TOXENV=py37-django-21-postgres DATABASE_URL="postgres://postgres@localhost:5432/py37-django-21-postgres" + python: "3.7" + sudo: required + dist: xenial - env: TOXENV=py35-django-20-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-20-postgres" python: "3.5" - env: TOXENV=py36-django-20-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-20-postgres" python: "3.6" + - env: TOXENV=py37-django-20-postgres DATABASE_URL="postgres://postgres@localhost:5432/py37-django-20-postgres" + python: "3.7" + sudo: required + dist: xenial - env: TOXENV=py27-django-111-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-111-postgres" python: "2.7" - env: TOXENV=py36-django-111-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-111-postgres" diff --git a/README.rst b/README.rst index 93d9ded..b989c80 100644 --- a/README.rst +++ b/README.rst @@ -46,10 +46,8 @@ recommended. It follows the `Django's support policy`_, supporting: * Django 1.9 with Python 2.7, 3.4, or 3.5 * Django 1.10 with Python 2.7, 3.4, or 3.5 * Django 1.11 (LTS) with Python 2.7, 3.4, 3.5, or 3.6 -* Django 2.0 with Python 3.4, 3.5 or 3.6 -* Django 2.1 with Python 3.5 or 3.6 - -Python 3.7 should work, but is untested in TravisCI. +* Django 2.0 with Python 3.4, 3.5, 3.6, or 3.7 +* Django 2.1 with Python 3.5, 3.6, or 3.7 .. _latest release: https://pypi.python.org/pypi/nose .. _Django's support policy: https://docs.djangoproject.com/en/1.8/internals/release-process/#supported-versions diff --git a/setup.py b/setup.py index 9331542..f11905a 100644 --- a/setup.py +++ b/setup.py @@ -83,6 +83,7 @@ def get_long_description(title): 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', 'Topic :: Software Development :: Testing' ] )