summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoehybird <ffabre@hybird.org>2018-12-17 11:05:22 +0100
committerCarlton Gibson <carlton.gibson@noumenal.es>2018-12-17 11:05:22 +0100
commit998d3a599150c8f12bfb146d60732bb222ae65a0 (patch)
tree9467f426959117cbb6f03a3d2dcf869d49cd6c7c
parent192b71c978ce93b02dad77dd0d3a2cab78e81cdc (diff)
downloaddjango-appconf-998d3a599150c8f12bfb146d60732bb222ae65a0.tar.gz
Follow django Python support map, add tox/travis targets for stable django 2.0 and 2.1 (#43)
* Follow django Python support map, add tox/travis targets for stable django 2.0 and 2.1 * Drop django 1.8 to 1.10. Add python 3.7
-rw-r--r--.travis.yml60
-rw-r--r--docs/changelog.rst5
-rw-r--r--setup.py6
-rw-r--r--tox.ini21
4 files changed, 50 insertions, 42 deletions
diff --git a/.travis.yml b/.travis.yml
index 190f875..de03f50 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,9 @@ language: python
matrix:
fast_finish: true
allow_failures:
- - env: TOXENV=py34-djmaster
- env: TOXENV=py35-djmaster
- env: TOXENV=py36-djmaster
+ - env: TOXENV=py37-djmaster
include:
# Python version is just for the look on travis.
- python: 2.7
@@ -16,46 +16,22 @@ matrix:
env: TOXENV=flake8-py34
- python: 2.7
- env: TOXENV=py27-dj18
-
- - python: 2.7
- env: TOXENV=py27-dj19
-
- - python: 2.7
- env: TOXENV=py27-dj110
-
- - python: 2.7
env: TOXENV=py27-dj111
- - python: 3.3
- env: TOXENV=py33-dj18
-
- - python: 3.4
- env: TOXENV=py34-dj18
-
- - python: 3.4
- env: TOXENV=py34-dj19
-
- - python: 3.4
- env: TOXENV=py34-dj110
-
- python: 3.4
env: TOXENV=py34-dj111
- python: 3.4
- env: TOXENV=py34-djmaster
-
- - python: 3.5
- env: TOXENV=py35-dj18
+ env: TOXENV=py34-dj20
- python: 3.5
- env: TOXENV=py35-dj19
+ env: TOXENV=py35-dj111
- python: 3.5
- env: TOXENV=py35-dj110
+ env: TOXENV=py35-dj20
- python: 3.5
- env: TOXENV=py35-dj111
+ env: TOXENV=py35-dj21
- python: 3.5
env: TOXENV=py35-djmaster
@@ -64,8 +40,34 @@ matrix:
env: TOXENV=py36-dj111
- python: 3.6
+ env: TOXENV=py36-dj20
+
+ - python: 3.6
+ env: TOXENV=py36-dj21
+
+ - python: 3.6
env: TOXENV=py36-djmaster
+ - python: 3.7
+ env: TOXENV=py37-dj111
+ dist: xenial
+ sudo: true
+
+ - python: 3.7
+ env: TOXENV=py37-dj20
+ dist: xenial
+ sudo: true
+
+ - python: 3.7
+ env: TOXENV=py37-dj21
+ dist: xenial
+ sudo: true
+
+ - python: 3.7
+ env: TOXENV=py37-djmaster
+ dist: xenial
+ sudo: true
+
install:
- pip install tox codecov
diff --git a/docs/changelog.rst b/docs/changelog.rst
index e2314a8..3f23928 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,8 +6,11 @@ Unreleased
* Update tox configuration to match Django Python support map
-* Confirm support for Django 1.10 and Django 1.11
+* Drop support for Django 1.8, 1.9 and 1.10
+* Drop support for python 3.3
+* Confirm support for Django 1.11, 2.0 and 2.1
+* Confirm support for python 3.7
1.0.2 (2016-04-19)
------------------
diff --git a/setup.py b/setup.py
index 31f610b..8f842e0 100644
--- a/setup.py
+++ b/setup.py
@@ -38,6 +38,8 @@ setup(
'Framework :: Django :: 1.9',
'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',
@@ -45,10 +47,12 @@ setup(
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
- 'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Topic :: Utilities',
],
+ project_urls={
+ 'Source': 'https://github.com/django-compressor/django-appconf',
+ }
)
diff --git a/tox.ini b/tox.ini
index b130d3a..839acf3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,34 +1,33 @@
[tox]
skipsdist = True
usedevelop = True
-minversion = 1.8
+minversion = 1.11
envlist =
flake8-py27,
flake8-py34,
- py{27,33,34,35}-dj18,
- py{27,34,35}-{dj19,dj110},
- py{27,34,35,36}-dj111,
- py{34,35,36}-djmaster
+ py{27,34,35,36,37}-dj111,
+ py{34,35,36,37}-dj20,
+ py{35,36,37}-dj21,
+ py{35,36,37}-djmaster
[testenv]
basepython =
py27: python2.7
- py33: python3.3
py34: python3.4
py35: python3.5
py36: python3.6
+ py37: python3.7
pypy: pypy
usedevelop = true
setenv =
PYTHONPATH = {toxinidir}
DJANGO_SETTINGS_MODULE=tests.test_settings
deps =
- py{27,33,34,35,36,pypy}: coverage
+ py{27,34,35,36,37,pypy}: coverage
django-discover-runner
- dj18: https://github.com/django/django/archive/stable/1.8.x.tar.gz#egg=django
- dj19: https://github.com/django/django/archive/stable/1.9.x.tar.gz#egg=django
- dj110: https://github.com/django/django/archive/stable/1.10.x.tar.gz#egg=django
- dj111: https://github.com/django/django/archive/stable/1.11.x.tar.gz#egg=django
+ dj111: Django>=1.11,<2.0
+ dj20: Django>=2.0,<2.1
+ dj21: https://github.com/django/django/archive/stable/2.1.x.tar.gz#egg=django
djmaster: https://github.com/django/django/archive/master.tar.gz#egg=django
commands =