Skip to content

Commit 42eae06

Browse files
jwhitlockjwhitlock
authored
Merge pull request #297 from jwhitlock/django-2.1
Add Django 2.1 support, Python 3.7 tests, release 1.4.6
2 parents 7ee49f6 + eba27f9 commit 42eae06

File tree

6 files changed

+90
-8
lines changed

6 files changed

+90
-8
lines changed

‎.travis.yml

+70-4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@ matrix:
1111
- env: TOXENV=docs
1212
python: "3.5"
1313
# Supported Python / Django versions w/ SQLite
14+
- env: TOXENV=py35-django-21
15+
python: "3.5"
16+
- env: TOXENV=py36-django-21
17+
python: "3.6"
18+
- env: TOXENV=py37-django-21
19+
python: "3.7"
20+
sudo: required
21+
dist: xenial
1422
- env: TOXENV=py35-django-20
1523
python: "3.5"
1624
- env: TOXENV=py36-django-20
@@ -32,56 +40,114 @@ matrix:
3240
- env: TOXENV=py34-django-18
3341
python: "3.4"
3442
# Test with PostgreSQL
35-
- env: TOXENV=py35-django-20-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-111-postgres"
43+
- env: TOXENV=py35-django-21-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-21-postgres"
44+
python: "3.5"
45+
services: postgresql
46+
- env: TOXENV=py36-django-21-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-21-postgres"
47+
python: "3.6"
48+
services: postgresql
49+
- env: TOXENV=py37-django-21-postgres DATABASE_URL="postgres://postgres@localhost:5432/py37-django-21-postgres"
50+
python: "3.7"
51+
sudo: required
52+
dist: xenial
53+
services: postgresql
54+
- env: TOXENV=py35-django-20-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-20-postgres"
3655
python: "3.5"
37-
- env: TOXENV=py36-django-20-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-111-postgres"
56+
services: postgresql
57+
- env: TOXENV=py36-django-20-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-20-postgres"
3858
python: "3.6"
59+
services: postgresql
60+
- env: TOXENV=py37-django-20-postgres DATABASE_URL="postgres://postgres@localhost:5432/py37-django-20-postgres"
61+
python: "3.7"
62+
sudo: required
63+
dist: xenial
64+
services: postgresql
3965
- env: TOXENV=py27-django-111-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-111-postgres"
4066
python: "2.7"
67+
services: postgresql
4168
- env: TOXENV=py36-django-111-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-111-postgres"
4269
python: "3.6"
70+
services: postgresql
4371
- env: TOXENV=py27-django-110-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-110-postgres"
4472
python: "2.7"
73+
services: postgresql
4574
- env: TOXENV=py35-django-110-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-110-postgres"
4675
python: "3.5"
76+
services: postgresql
4777
- env: TOXENV=py27-django-19-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-19-postgres"
4878
python: "2.7"
79+
services: postgresql
4980
- env: TOXENV=py35-django-19-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-19-postgres"
5081
python: "3.5"
82+
services: postgresql
5183
- env: TOXENV=py27-django-18-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-18-postgres"
5284
python: "2.7"
85+
services: postgresql
5386
# Test with MySQL
54-
- env: TOXENV=py35-django-20-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-111-mysql"
87+
- env: TOXENV=py35-django-21-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-21-mysql"
88+
python: "3.5"
89+
services: mysql
90+
- env: TOXENV=py36-django-21-mysql DATABASE_URL="mysql://travis@localhost:3306/py36-django-21-mysql"
91+
python: "3.6"
92+
services: mysql
93+
- env: TOXENV=py37-django-21-mysql DATABASE_URL="mysql://travis@localhost:3306/py37-django-21-mysql"
94+
python: "3.7"
95+
sudo: required
96+
dist: xenial
97+
services: mysql
98+
- env: TOXENV=py35-django-20-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-20-mysql"
5599
python: "3.5"
56-
- env: TOXENV=py36-django-20-mysql DATABASE_URL="mysql://travis@localhost:3306/py36-django-111-mysql"
100+
services: mysql
101+
- env: TOXENV=py36-django-20-mysql DATABASE_URL="mysql://travis@localhost:3306/py36-django-20-mysql"
57102
python: "3.6"
103+
services: mysql
104+
- env: TOXENV=py37-django-20-mysql DATABASE_URL="mysql://travis@localhost:3306/py37-django-20-mysql"
105+
python: "3.7"
106+
sudo: required
107+
dist: xenial
108+
services: mysql
58109
- env: TOXENV=py27-django-111-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-111-mysql"
59110
python: "2.7"
111+
services: mysql
60112
- env: TOXENV=py36-django-111-mysql DATABASE_URL="mysql://travis@localhost:3306/py36-django-111-mysql"
61113
python: "3.6"
114+
services: mysql
62115
- env: TOXENV=py27-django-110-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-110-mysql"
63116
python: "2.7"
117+
services: mysql
64118
- env: TOXENV=py35-django-110-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-110-mysql"
65119
python: "3.5"
120+
services: mysql
66121
- env: TOXENV=py27-django-19-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-19-mysql"
67122
python: "2.7"
123+
services: mysql
68124
- env: TOXENV=py35-django-19-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-19-mysql"
69125
python: "3.5"
126+
services: mysql
70127
- env: TOXENV=py27-django-18-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-18-mysql"
71128
python: "2.7"
129+
services: mysql
72130
# Django master is allowed to fail
73131
- env: TOXENV=py35-django-master
74132
python: "3.5"
75133
- env: TOXENV=py36-django-master
76134
python: "3.6"
135+
- env: TOXENV=py37-django-master
136+
python: "3.7"
137+
sudo: required
138+
dist: xenial
77139
- env: TOXENV=py35-django-master-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-master-mysql"
78140
python: "3.5"
141+
language: pyth
142+
services: mysql
79143
- env: TOXENV=py36-django-master-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-master-postgres"
80144
python: "3.6"
145+
services: postgresql
81146
allow_failures:
82147
# Master is allowed to fail
83148
- env: TOXENV=py35-django-master
84149
- env: TOXENV=py36-django-master
150+
- env: TOXENV=py37-django-master
85151
- env: TOXENV=py35-django-master-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-master-mysql"
86152
- env: TOXENV=py36-django-master-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-master-postgres"
87153

‎README.rst

+2-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ recommended. It follows the `Django's support policy`_, supporting:
4646
* Django 1.9 with Python 2.7, 3.4, or 3.5
4747
* Django 1.10 with Python 2.7, 3.4, or 3.5
4848
* Django 1.11 (LTS) with Python 2.7, 3.4, 3.5, or 3.6
49-
* Django 2.0 with Python 3.5 or 3.6
49+
* Django 2.0 with Python 3.4, 3.5, 3.6, or 3.7
50+
* Django 2.1 with Python 3.5, 3.6, or 3.7
5051

5152
.. _latest release: https://pypi.python.org/pypi/nose
5253
.. _Django's support policy: https://docs.djangoproject.com/en/1.8/internals/release-process/#supported-versions

‎changelog.rst

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Changelog
22
---------
33

4+
1.4.6 (2018-10-03)
5+
~~~~~~~~~~~~~~~~~~
6+
* Document Django 2.0 and 2.1 support, no changes needed
7+
* Document Python 3.7 support
8+
49
1.4.5 (2017-08-22)
510
~~~~~~~~~~~~~~~~~~
611
* Add Django 1.11 support

‎django_nose/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
assert NoseTestSuiteRunner
99
assert FastFixtureTestCase
1010

11-
VERSION = (1, 4, 5)
11+
VERSION = (1, 4, 6)
1212
__version__ = '.'.join(map(str, VERSION))

‎setup.py

+9-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def get_long_description(title):
3737

3838
setup(
3939
name='django-nose',
40-
version='1.4.5',
40+
version='1.4.6',
4141
description='Makes your Django tests simple and snappy',
4242
long_description=get_long_description('django-nose'),
4343
author='Jeff Balogh',
@@ -66,6 +66,12 @@ def get_long_description(title):
6666
'Development Status :: 5 - Production/Stable',
6767
'Environment :: Web Environment',
6868
'Framework :: Django',
69+
'Framework :: Django :: 1.8',
70+
'Framework :: Django :: 1.9',
71+
'Framework :: Django :: 1.10',
72+
'Framework :: Django :: 1.11',
73+
'Framework :: Django :: 2.0',
74+
'Framework :: Django :: 2.1',
6975
'Intended Audience :: Developers',
7076
'License :: OSI Approved :: BSD License',
7177
'Operating System :: OS Independent',
@@ -76,6 +82,8 @@ def get_long_description(title):
7682
'Programming Language :: Python :: 3',
7783
'Programming Language :: Python :: 3.4',
7884
'Programming Language :: Python :: 3.5',
85+
'Programming Language :: Python :: 3.6',
86+
'Programming Language :: Python :: 3.7',
7987
'Topic :: Software Development :: Testing'
8088
]
8189
)

‎tox.ini

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
envlist =
33
py{27,34,35}-django-{18,19,110}{,-postgres,-mysql}
44
py{27,34,35,36}-django-111{,-postgres,-mysql}
5-
py{35,36}-django-{20,master}{,-postgres,-mysql}
5+
py{34,35,36,37}-django-20{,-postgres,-mysql}
6+
py{35,36,37}-django-{21,master}{,-postgres,-mysql}
67
flake8
78
docs
89
skip_missing_interpreters = True
@@ -20,6 +21,7 @@ deps =
2021
django-110: Django>=1.10,<1.11
2122
django-111: Django>=1.11,<2.0
2223
django-20: Django>=2.0,<2.1
24+
django-21: Django>=2.1,<2.2
2325
django-master: https://github.com/django/django/archive/master.tar.gz
2426
postgres: psycopg2
2527
mysql: mysqlclient

0 commit comments

Comments
 (0)