Skip to content

Commit e6dadb7

Browse files
authored
Merge pull request #83 from benjaoming/django2.1
Add django 2.1 support, supersedes #82
2 parents cb26964 + 9141d9a commit e6dadb7

File tree

5 files changed

+27
-4
lines changed

5 files changed

+27
-4
lines changed

.travis.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ matrix:
2525
dist: trusty
2626
sudo: false
2727
env: DJANGO="2.0"
28+
- python: 3.5
29+
dist: trusty
30+
sudo: false
31+
env: DJANGO="2.1"
2832

2933
- python: 3.6
3034
dist: trusty
@@ -34,16 +38,24 @@ matrix:
3438
dist: trusty
3539
sudo: false
3640
env: DJANGO="2.0"
41+
- python: 3.6
42+
dist: trusty
43+
sudo: false
44+
env: DJANGO="2.1"
3745

3846
- python: 3.7
3947
dist: xenial
4048
sudo: true
4149
env: DJANGO="2.0"
50+
- python: 3.7
51+
dist: xenial
52+
sudo: true
53+
env: DJANGO="2.1"
4254

4355
- python: pypy
4456
dist: trusty
4557
sudo: false
46-
env: DJANGO="2.0"
58+
env: DJANGO="2.1"
4759

4860
install:
4961
- pip install tox tox-travis coverage codecov

django_nyt/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
_disable_notifications = False
22

3-
__version__ = "1.1.1"
3+
__version__ = "1.1.2"
44

55
default_app_config = "django_nyt.apps.DjangoNytConfig"

docs/release_notes.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
Release Notes
22
=============
33

4+
1.1.2
5+
-----
6+
7+
Added
8+
^^^^^
9+
10+
* Django 2.1 support (no changes in code)
11+
12+
413
1.1.1
514
-----
615

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
keywords=["django", "notification" "alerts"],
1818
packages=find_packages(),
1919
zip_safe=False,
20-
install_requires=["django>=1.11,<2.1"],
20+
install_requires=["django>=1.11,<2.2"],
2121
classifiers=[
2222
'Development Status :: 5 - Production/Stable',
2323
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',

tox.ini

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
# Ensure you add to .travis.yml if you add here
3-
envlist = {py34,py35,py36}-django{111,20}
3+
envlist = {py34,py35,py36}-django{111,20,21}
44

55
[travis]
66
python =
@@ -13,6 +13,7 @@ python =
1313
DJANGO =
1414
1.11: django111
1515
2.0: django20
16+
2.1: django21
1617
LINT =
1718
yes: lint
1819

@@ -28,6 +29,7 @@ deps =
2829
coverage
2930
django111: Django>=1.11,<2.0
3031
django20: Django>=2.0,<2.1
32+
django21: Django>=2.1,<2.2
3133

3234
basepython =
3335
py34: python3.4

0 commit comments

Comments
 (0)