Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
sudo: no
language: python
cache: pip
dist: xenial

matrix:
include:
# Need to use xenial in the docs build for a more recent version of sqlite.
- python: 3.6
dist: xenial
env: TOXENV=docs
- python: 3.5
env: TOXENV=prospector
- python: 2.7
env: TOXENV=py27-1.11
- python: pypy
dist: trusty
env: TOXENV=pypy-1.11
- python: 3.4
env: TOXENV=py34-1.11
Expand All @@ -28,42 +28,37 @@ matrix:
env: TOXENV=py35-2.0
- python: 3.6
env: TOXENV=py36-2.0
- python: 3.7
env: TOXENV=py37-2.0
- python: pypy3.5
env: TOXENV=pypy3-2.0
- python: 3.5
env: TOXENV=py35-2.1
- python: 3.6
env: TOXENV=py36-2.1
- python: 3.7
dist: xenial
env: TOXENV=py37-2.1
- python: pypy3.5
env: TOXENV=pypy3-2.1
- python: 3.5
dist: xenial
env: TOXENV=py35-2.2
- python: 3.6
dist: xenial
env: TOXENV=py36-2.2
- python: 3.7
dist: xenial
env: TOXENV=py37-2.2
- python: pypy3.5
dist: xenial
env: TOXENV=pypy3-2.2
- python: 3.6
dist: xenial
env: TOXENV=py36-master
- python: 3.7
dist: xenial
env: TOXENV=py37-master
allow_failures:
- python: 3.6
dist: xenial
env: TOXENV=py36-master
- python: 3.7
dist: xenial
env: TOXENV=py37-master
- python: pypy3.5
env: TOXENV=pypy3-master
install:
- pip wheel -r tests/requirements.txt codecov
- pip install virtualenv codecov tox
Expand Down
1 change: 1 addition & 0 deletions docs/authors.rst
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ Authors
* Matias Dinota
* Michał Sałaban
* Mike Lissner
* Morgane Alonso
* Olivier Sels
* Olle Vidner
* Paul Donohue
Expand Down
4 changes: 4 additions & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ Other changes:

- Extended validation of BICs to check for the correct character set

- Run tests for Django 2.2 and Python 3.5, 3.6 and 3.7

- Run tests for Django 2.0 and Python 3.7


2.1 (2018-08-24)
------------------
Expand Down
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ def find_package_data(where='.', package='',
'Framework :: Django :: 1.11',
'Framework :: Django :: 2.0',
'Framework :: Django :: 2.1',
'Framework :: Django :: 2.2',
'Intended Audience :: Developers',
'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent',
Expand All @@ -137,6 +138,7 @@ def find_package_data(where='.', package='',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Topic :: Internet :: WWW/HTTP',
],
zip_safe=False,
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ args_are_paths = false
envlist =
docs,prospector
{py27,pypy,py34,py35,py36,pypy3}-1.11
{py34,py35,py36,pypy3}-2.0
{py34,py35,py36,py37,pypy3}-2.0
{py35,py36,py37,pypy3}-2.1
{py35,py36,py37,pypy3}-2.2
{py36,py37,pypy3}-master
Expand All @@ -25,7 +25,7 @@ deps =
1.11: Django>=1.11,<2.0
2.0: Django>=2.0,<2.1
2.1: Django>=2.1,<2.2
2.2: Django==2.2rc1
2.2: Django>=2.2,<2.3
master: https://github.com/django/django/archive/master.tar.gz
-r{toxinidir}/tests/requirements.txt

Expand Down