From 41b905c92eb408fdca94831af5ba9b22a16c39d7 Mon Sep 17 00:00:00 2001 From: John Franey Date: Wed, 11 Sep 2019 15:06:24 -0400 Subject: [PATCH 1/5] Update tested Python & Django versions Replaces `django.utils.six` with `six` to support newer Django versions. Updates Tox config to: - remove unsupported Django versions - add pypy3 - add Django 2.2 - update djmaster Python versions --- configurations/base.py | 2 +- configurations/utils.py | 2 +- configurations/values.py | 2 +- setup.py | 2 +- tests/settings/main.py | 1 - tests/urls.py | 4 ---- tox.ini | 11 ++++++----- 7 files changed, 10 insertions(+), 14 deletions(-) diff --git a/configurations/base.py b/configurations/base.py index c9778fb..1f38cf0 100644 --- a/configurations/base.py +++ b/configurations/base.py @@ -1,7 +1,7 @@ import os import re +import six -from django.utils import six from django.conf import global_settings from django.core.exceptions import ImproperlyConfigured diff --git a/configurations/utils.py b/configurations/utils.py index 1d4a401..7f972e7 100644 --- a/configurations/utils.py +++ b/configurations/utils.py @@ -1,10 +1,10 @@ import inspect +import six import sys from importlib import import_module from django.core.exceptions import ImproperlyConfigured -from django.utils import six def isuppercase(name): diff --git a/configurations/values.py b/configurations/values.py index 0f96e3d..8f10338 100644 --- a/configurations/values.py +++ b/configurations/values.py @@ -2,11 +2,11 @@ import ast import copy import decimal import os +import six import sys from django.core import validators from django.core.exceptions import ValidationError, ImproperlyConfigured -from django.utils import six from .utils import import_by_path, getargspec diff --git a/setup.py b/setup.py index 7a2efdf..7134712 100644 --- a/setup.py +++ b/setup.py @@ -41,6 +41,7 @@ setup( 'django-cadmin = configurations.management:execute_from_command_line', ], }, + install_requires=['six'], extras_require={ 'cache': ['django-cache-url'], 'database': ['dj-database-url'], @@ -53,7 +54,6 @@ setup( 'dj-database-url', 'dj-email-url', 'dj-search-url', - 'six', 'Sphinx>=1.4', ], }, diff --git a/tests/settings/main.py b/tests/settings/main.py index 2e0b779..90e252f 100644 --- a/tests/settings/main.py +++ b/tests/settings/main.py @@ -31,7 +31,6 @@ class Test(Configuration): 'django.contrib.contenttypes', 'django.contrib.sites', 'django.contrib.auth', - 'django.contrib.admin', 'tests', ] diff --git a/tests/urls.py b/tests/urls.py index ede2ec9..1170d21 100644 --- a/tests/urls.py +++ b/tests/urls.py @@ -1,6 +1,2 @@ -from django.conf.urls import url -from django.contrib import admin - urlpatterns = [ - url(r'^admin/', admin.site.urls), ] diff --git a/tox.ini b/tox.ini index 233ad84..78f3055 100644 --- a/tox.ini +++ b/tox.ini @@ -6,9 +6,10 @@ whitelist_externals = sphinx-build envlist = checkqa, readme-py27, - py{27,34,35,36,py}-dj{18,110,111} - py{34,35,36,37}-dj20 - py{35,36,37}-dj{21,master} + py{27,34,35,36,py}-dj111 + py{34,35,36,37,py3}-dj20 + py{35,36,37,py3}-dj{21,22} + py{36,37,38,py3}-dj{30,master} [testenv] usedevelop = true @@ -18,11 +19,11 @@ setenv = coverage: COVERAGE_PROCESS_START = {toxinidir}/setup.cfg coverage: _TEST_RUN_PREFIX=coverage run deps = - dj18: django>=1.8,<1.9 - dj110: django>=1.10,<1.11 dj111: django>=1.11,<2.0 dj20: django>=2.0a1,<2.1 dj21: django>=2.1a1,<2.2 + dj22: django>=2.2a1,<3.0 + dj30: django>=3.0a1<3.1 djmaster: https://github.com/django/django/archive/master.tar.gz#egg=django py27,pypy: mock coverage: coverage From f387e1ee6395e142b14053da758ac39e8aeaf839 Mon Sep 17 00:00:00 2001 From: John Franey Date: Thu, 28 Nov 2019 20:12:04 -0500 Subject: [PATCH 2/5] Remove Python 3.4 and add 3.8 --- .travis.yml | 17 ++++++++++------- setup.py | 2 ++ tox.ini | 9 +++++---- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9e07fe7..b23b504 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,17 +7,12 @@ matrix: python: 2.7 - env: TOXENV=py27-dj111-coverage python: 2.7 - - env: TOXENV=py34-dj111-coverage - python: 3.4 - env: TOXENV=py35-dj111-coverage python: 3.5 - env: TOXENV=py36-dj111-coverage python: 3.6 - env: TOXENV=pypy-dj111-coverage python: pypy - - env: TOXENV=py34-dj20-coverage - python: 3.4 - - env: TOXENV=py35-dj20-coverage python: 3.5 - env: TOXENV=py35-djmaster-coverage python: 3.5 @@ -39,6 +34,14 @@ matrix: python: 3.7 dist: xenial sudo: true + - env: TOXENV=py38-dj22-coverage + python: 3.8 + dist: xenial + sudo: true + - env: TOXENV=py38-dj30-coverage + python: 3.8 + dist: xenial + sudo: true allow_failures: - env: TOXENV=py35-djmaster-coverage python: 3.5 @@ -46,8 +49,8 @@ matrix: python: 3.6 - env: TOXENV=py37-djmaster-coverage python: 3.7 - dist: xenial - sudo: true + - env: TOXENV=py38-djmaster-coverage + python: 3.8 install: - pip install tox script: tox -v diff --git a/setup.py b/setup.py index 7134712..708bd62 100644 --- a/setup.py +++ b/setup.py @@ -68,6 +68,8 @@ setup( 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: Implementation :: PyPy', 'Topic :: Utilities', ], zip_safe=False, diff --git a/tox.ini b/tox.ini index 78f3055..e3e1ac1 100644 --- a/tox.ini +++ b/tox.ini @@ -6,9 +6,10 @@ whitelist_externals = sphinx-build envlist = checkqa, readme-py27, - py{27,34,35,36,py}-dj111 - py{34,35,36,37,py3}-dj20 - py{35,36,37,py3}-dj{21,22} + py{27,35,36,py}-dj111 + py{35,36,37,py3}-dj20 + py{35,36,37,py3}-dj21 + py{35,36,37,38,py3}-dj22 py{36,37,38,py3}-dj{30,master} [testenv] @@ -23,7 +24,7 @@ deps = dj20: django>=2.0a1,<2.1 dj21: django>=2.1a1,<2.2 dj22: django>=2.2a1,<3.0 - dj30: django>=3.0a1<3.1 + dj30: django>=3.0a1,<3.1 djmaster: https://github.com/django/django/archive/master.tar.gz#egg=django py27,pypy: mock coverage: coverage From 0f479a56f508583f20bddd188208a9cb046f8a22 Mon Sep 17 00:00:00 2001 From: John Franey Date: Thu, 28 Nov 2019 20:22:44 -0500 Subject: [PATCH 3/5] Remove xenial references for Travis Removes Xenial references in Travis config file since it is now the default CI build environment. See: https://blog.travis-ci.com/2019-04-15-xenial-default-build-environment --- .travis.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index b23b504..a4729b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,6 @@ matrix: python: 3.6 - env: TOXENV=pypy-dj111-coverage python: pypy - python: 3.5 - env: TOXENV=py35-djmaster-coverage python: 3.5 - env: TOXENV=py36-dj20-coverage @@ -24,23 +23,18 @@ matrix: python: 3.6 - env: TOXENV=py37-dj20-coverage python: 3.7 - dist: xenial sudo: true - env: TOXENV=py37-dj21-coverage python: 3.7 - dist: xenial sudo: true - env: TOXENV=py37-djmaster-coverage python: 3.7 - dist: xenial sudo: true - env: TOXENV=py38-dj22-coverage python: 3.8 - dist: xenial sudo: true - env: TOXENV=py38-dj30-coverage python: 3.8 - dist: xenial sudo: true allow_failures: - env: TOXENV=py35-djmaster-coverage From 9c9b07dca539b2015c7c32fb1677ddae9942d1d5 Mon Sep 17 00:00:00 2001 From: John Franey Date: Thu, 28 Nov 2019 20:35:00 -0500 Subject: [PATCH 4/5] Sort .travis.yml by dj version; add more pypy3 coverage --- .travis.yml | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index a4729b7..9ce3e2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,38 +13,55 @@ matrix: python: 3.6 - env: TOXENV=pypy-dj111-coverage python: pypy - - env: TOXENV=py35-djmaster-coverage + - env: TOXENV=pypy3-dj111-coverage + python: pypy3 + - env: TOXENV=py35-dj20-coverage python: 3.5 - env: TOXENV=py36-dj20-coverage python: 3.6 - - env: TOXENV=py36-dj21-coverage - python: 3.6 - - env: TOXENV=py36-djmaster-coverage - python: 3.6 - env: TOXENV=py37-dj20-coverage python: 3.7 - sudo: true + - env: TOXENV=pypy3-dj20-coverage + python: pypy3 + - env: TOXENV=py36-dj21-coverage + python: 3.6 - env: TOXENV=py37-dj21-coverage python: 3.7 - sudo: true - - env: TOXENV=py37-djmaster-coverage + - env: TOXENV=pypy3-dj21-coverage + python: pypy3 + - env: TOXENV=py36-dj22-coverage + python: 3.6 + - env: TOXENV=py37-dj22-coverage python: 3.7 - sudo: true - env: TOXENV=py38-dj22-coverage python: 3.8 - sudo: true + - env: TOXENV=pypy3-dj22-coverage + python: pypy3 + - env: TOXENV=py36-dj30-coverage + python: 3.6 + - env: TOXENV=py37-dj30-coverage + python: 3.7 - env: TOXENV=py38-dj30-coverage python: 3.8 - sudo: true - allow_failures: - - env: TOXENV=py35-djmaster-coverage - python: 3.5 + - env: TOXENV=pypy3-dj30-coverage + python: pypy3 - env: TOXENV=py36-djmaster-coverage python: 3.6 - env: TOXENV=py37-djmaster-coverage python: 3.7 - env: TOXENV=py38-djmaster-coverage python: 3.8 + - env: TOXENV=pypy3-djmaster-coverage + python: pypy3 + allow_failures: + - env: TOXENV=py36-djmaster-coverage + python: 3.6 + - env: TOXENV=py37-djmaster-coverage + python: 3.7 + - env: TOXENV=py38-djmaster-coverage + python: 3.8 + - env: TOXENV=pypy3-djmaster-coverage + python: pypy3 install: - pip install tox script: tox -v From 7e74d67308a9b3f07a25c188aa4fbb1268ffa95e Mon Sep 17 00:00:00 2001 From: John Franey Date: Fri, 29 Nov 2019 12:03:02 -0500 Subject: [PATCH 5/5] Update changelog for v2.2 --- docs/changes.rst | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/docs/changes.rst b/docs/changes.rst index f8f5b80..cb59791 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -3,10 +3,20 @@ Changelog --------- -v2.2 (2018-xx-yy) +v2.2 (2019-xx-yy) ^^^^^^^^^^^^^^^^^ -- **BACKWARD INCOMPATIBLE** Drop support of Django < 1.11. +- **BACKWARD INCOMPATIBLE** Drop support for Python 3.4. + +- **BACKWARD INCOMPATIBLE** Drop support for Django < 1.11. + +- Add support for Django 3.0. + +- Add support for Python Python 3.8. + +- Add support for Python PyPy 3. + +- Replace ``django.utils.six`` with ``six`` to support Django >= 3. v2.1 (2018-08-16) ^^^^^^^^^^^^^^^^^