Skip to content

Commit

Permalink
Update Django testing matrix and Python support
Browse files Browse the repository at this point in the history
  • Loading branch information
ralphje committed May 4, 2020
1 parent 85a26c2 commit 326d623
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 57 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ __pycache__/
# Distribution / packaging
.Python
env/
venv/
build/
develop-eggs/
dist/
Expand Down
50 changes: 16 additions & 34 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,45 +13,27 @@ env:
matrix:
include:
- env: TOXENV=docs
- python: 2.7
env: TOXENV=py27-1.8
- python: 2.7
env: TOXENV=py27-1.9
- python: 2.7
env: TOXENV=py27-1.10
- python: 2.7
env: TOXENV=py27-1.11
- python: 3.3
env: TOXENV=py33-1.8
- python: 3.4
env: TOXENV=py34-1.8
- python: 3.4
env: TOXENV=py34-1.9
- python: 3.4
env: TOXENV=py34-1.10
- python: 3.4
env: TOXENV=py34-1.11
- python: 3.4
env: TOXENV=py34-2.0
- python: 3.5
env: TOXENV=py35-1.8
- python: 3.5
env: TOXENV=py35-1.9
- python: 3.5
env: TOXENV=py35-1.10
- python: 3.5
env: TOXENV=py35-1.11
- python: 3.5
env: TOXENV=py35-2.0
- python: 3.5
env: TOXENV=py35-master
env: TOXENV=py35-2.2
- python: 3.6
env: TOXENV=py36-1.11
env: TOXENV=py36-2.2
- python: 3.6
env: TOXENV=py36-2.0
env: TOXENV=py36-3.0
- python: 3.6
env: TOXENV=py36-master
- python: 3.7
env: TOXENV=py37-2.2
- python: 3.7
env: TOXENV=py37-3.0
- python: 3.7
env: TOXENV=py37-master
- python: 3.8
env: TOXENV=py38-2.2
- python: 3.8
env: TOXENV=py38-3.0
- python: 3.8
env: TOXENV=py38-master
after_success: codecov
cache:
directories:
- $HOME/.wheels
- $HOME/.wheels
15 changes: 5 additions & 10 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,7 @@ def find_package_data(where='.', package='',
if (fnmatchcase(name, pattern) or fn.lower() == pattern.lower()):
bad_name = True
if show_ignored:
print >> sys.stderr, (
"Directory %s ignored by pattern %s"
% (fn, pattern))
sys.stderr.write("Directory %s ignored by pattern %s" % (fn, pattern))
break
if bad_name:
continue
Expand All @@ -92,9 +90,7 @@ def find_package_data(where='.', package='',
if (fnmatchcase(name, pattern) or fn.lower() == pattern.lower()):
bad_name = True
if show_ignored:
print >> sys.stderr, (
"File %s ignored by pattern %s"
% (fn, pattern))
sys.stderr.write("File %s ignored by pattern %s" % (fn, pattern))
break
if bad_name:
continue
Expand Down Expand Up @@ -123,12 +119,11 @@ def find_package_data(where='.', package='',
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
'Programming Language :: Python',
'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',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Topic :: Internet :: WWW/HTTP',
],
zip_safe=False,
Expand Down
20 changes: 7 additions & 13 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,22 @@
args_are_paths = false
envlist =
docs,
{py27,py33,py34,py35}-1.8
{py27,py34,py35}-{1.9,1.10}
{py27,py34,py35,py36}-1.11
{py34,py35,py36}-2.0
{py35,py36}-master
{py35,py36,py37,py38}-2.2
{py36,py37,py38}-3.0
{py36,py37,py38}-master

[testenv]
basepython =
py27: python2.7
py33: python3.3
py34: python3.4
py35: python3.5
py36: python3.6
py37: python3.7
py38: python3.8
usedevelop = true
commands =
invoke test {posargs}
deps =
1.8: Django>=1.8,<1.9
1.9: Django>=1.9,<1.10
1.10: Django>=1.10,<1.11
1.11: Django>=1.11,<2.0
2.0: Django>=2.0,<2.1
2.2: Django>=2.2,<2.3
3.0: Django>=3.0,<3.1
master: https://github.com/django/django/archive/master.tar.gz
-r{toxinidir}/tests/requirements.txt

Expand Down

0 comments on commit 326d623

Please sign in to comment.