Skip to content

Commit

Permalink
Merge b27b7fe into 7ee49f6
Browse files Browse the repository at this point in the history
  • Loading branch information
@jwhitlock
jwhitlock committed Oct 3, 2018
2 parents 7ee49f6 + b27b7fe commit 3c344fc
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 8 deletions.
38 changes: 34 additions & 4 deletions .travis.yml
View file
Expand Up @@ -11,6 +11,14 @@ matrix:
- env: TOXENV=docs
python: "3.5"
# Supported Python / Django versions w/ SQLite
- env: TOXENV=py35-django-21
python: "3.5"
- env: TOXENV=py36-django-21
python: "3.6"
- env: TOXENV=py37-django-21
python: "3.7"
sudo: required
dist: xenial
- env: TOXENV=py35-django-20
python: "3.5"
- env: TOXENV=py36-django-20
Expand All @@ -32,10 +40,22 @@ matrix:
- env: TOXENV=py34-django-18
python: "3.4"
# Test with PostgreSQL
- env: TOXENV=py35-django-20-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-111-postgres"
- env: TOXENV=py35-django-21-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-21-postgres"
python: "3.5"
- env: TOXENV=py36-django-21-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-21-postgres"
python: "3.6"
- env: TOXENV=py37-django-21-postgres DATABASE_URL="postgres://postgres@localhost:5432/py37-django-21-postgres"
python: "3.7"
sudo: required
dist: xenial
- env: TOXENV=py35-django-20-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-20-postgres"
python: "3.5"
- env: TOXENV=py36-django-20-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-111-postgres"
- env: TOXENV=py36-django-20-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-20-postgres"
python: "3.6"
- env: TOXENV=py37-django-20-postgres DATABASE_URL="postgres://postgres@localhost:5432/py37-django-20-postgres"
python: "3.7"
sudo: required
dist: xenial
- env: TOXENV=py27-django-111-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-111-postgres"
python: "2.7"
- env: TOXENV=py36-django-111-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-111-postgres"
Expand All @@ -51,9 +71,13 @@ matrix:
- env: TOXENV=py27-django-18-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-18-postgres"
python: "2.7"
# Test with MySQL
- env: TOXENV=py35-django-20-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-111-mysql"
- env: TOXENV=py35-django-21-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-21-mysql"
python: "3.5"
- env: TOXENV=py36-django-21-mysql DATABASE_URL="mysql://travis@localhost:3306/py36-django-21-mysql"
python: "3.6"
- env: TOXENV=py35-django-20-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-20-mysql"
python: "3.5"
- env: TOXENV=py36-django-20-mysql DATABASE_URL="mysql://travis@localhost:3306/py36-django-111-mysql"
- env: TOXENV=py36-django-20-mysql DATABASE_URL="mysql://travis@localhost:3306/py36-django-20-mysql"
python: "3.6"
- env: TOXENV=py27-django-111-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-111-mysql"
python: "2.7"
Expand All @@ -74,14 +98,20 @@ matrix:
python: "3.5"
- env: TOXENV=py36-django-master
python: "3.6"
- env: TOXENV=py37-django-master
python: "3.7"
sudo: required
dist: xenial
- env: TOXENV=py35-django-master-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-master-mysql"
python: "3.5"
language: pyth
- env: TOXENV=py36-django-master-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-master-postgres"
python: "3.6"
allow_failures:
# Master is allowed to fail
- env: TOXENV=py35-django-master
- env: TOXENV=py36-django-master
- env: TOXENV=py37-django-master
- env: TOXENV=py35-django-master-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-master-mysql"
- env: TOXENV=py36-django-master-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-master-postgres"

Expand Down
3 changes: 2 additions & 1 deletion README.rst
View file
Expand Up @@ -46,7 +46,8 @@ recommended. It follows the `Django's support policy`_, supporting:
* Django 1.9 with Python 2.7, 3.4, or 3.5
* Django 1.10 with Python 2.7, 3.4, or 3.5
* Django 1.11 (LTS) with Python 2.7, 3.4, 3.5, or 3.6
* Django 2.0 with Python 3.5 or 3.6
* Django 2.0 with Python 3.4, 3.5, 3.6, or 3.7
* Django 2.1 with Python 3.5, 3.6, or 3.7

.. _latest release: https://pypi.python.org/pypi/nose
.. _Django's support policy: https://docs.djangoproject.com/en/1.8/internals/release-process/#supported-versions
Expand Down
4 changes: 4 additions & 0 deletions changelog.rst
View file
@@ -1,6 +1,10 @@
Changelog
---------

1.4.6 (2018-10-03)
~~~~~~~~~~~~~~~~~~
* Document Django 2.0 and 2.1 support. No library changes needed.

1.4.5 (2017-08-22)
~~~~~~~~~~~~~~~~~~
* Add Django 1.11 support
Expand Down
2 changes: 1 addition & 1 deletion django_nose/__init__.py
View file
Expand Up @@ -8,5 +8,5 @@
assert NoseTestSuiteRunner
assert FastFixtureTestCase

VERSION = (1, 4, 5)
VERSION = (1, 4, 6)
__version__ = '.'.join(map(str, VERSION))
10 changes: 9 additions & 1 deletion setup.py
View file
Expand Up @@ -37,7 +37,7 @@ def get_long_description(title):

setup(
name='django-nose',
version='1.4.5',
version='1.4.6',
description='Makes your Django tests simple and snappy',
long_description=get_long_description('django-nose'),
author='Jeff Balogh',
Expand Down Expand Up @@ -66,6 +66,12 @@ def get_long_description(title):
'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment',
'Framework :: Django',
'Framework :: Django :: 1.8',
'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',
Expand All @@ -76,6 +82,8 @@ def get_long_description(title):
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Topic :: Software Development :: Testing'
]
)
4 changes: 3 additions & 1 deletion tox.ini
View file
Expand Up @@ -2,7 +2,8 @@
envlist =
py{27,34,35}-django-{18,19,110}{,-postgres,-mysql}
py{27,34,35,36}-django-111{,-postgres,-mysql}
py{35,36}-django-{20,master}{,-postgres,-mysql}
py{34,35,36,37}-django-20{,-postgres,-mysql}
py{35,36,37}-django-{21,master}{,-postgres,-mysql}
flake8
docs
skip_missing_interpreters = True
Expand All @@ -20,6 +21,7 @@ deps =
django-110: Django>=1.10,<1.11
django-111: Django>=1.11,<2.0
django-20: Django>=2.0,<2.1
django-21: Django>=2.1,<2.2
django-master: https://github.com/django/django/archive/master.tar.gz
postgres: psycopg2
mysql: mysqlclient
Expand Down

0 comments on commit 3c344fc

Please sign in to comment.