Skip to content

Commit cb26964

Browse files
authored
Merge pull request #81 from benjaoming/feature/python37
Add Python 3.7 support, re-enable Travis lint check
2 parents 3d9ecdc + 61748ea commit cb26964

File tree

6 files changed

+64
-32
lines changed

6 files changed

+64
-32
lines changed

.travis.yml

Lines changed: 41 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,49 @@
1-
# Because Python 3.6 is available on GCE
2-
dist: trusty
3-
41
cache: pip
52

63
language: python
74

8-
python:
9-
- "3.4"
10-
- "3.5"
11-
- "3.6"
12-
13-
env:
14-
- LINT="yes"
15-
- DJANGO="1.11"
16-
- DJANGO="2.0"
17-
185
matrix:
19-
exclude:
20-
- python: "3.4"
21-
env: LINT="yes"
22-
- python: "3.5"
23-
env: LINT="yes"
24-
- python: "3.6"
6+
include:
7+
- python: 3.4
8+
dist: trusty
9+
sudo: false
2510
env: LINT="yes"
11+
- python: 3.4
12+
dist: trusty
13+
sudo: false
14+
env: DJANGO="1.11"
15+
- python: 3.4
16+
dist: trusty
17+
sudo: false
18+
env: DJANGO="2.0"
19+
20+
- python: 3.5
21+
dist: trusty
22+
sudo: false
23+
env: DJANGO="1.11"
24+
- python: 3.5
25+
dist: trusty
26+
sudo: false
27+
env: DJANGO="2.0"
28+
29+
- python: 3.6
30+
dist: trusty
31+
sudo: false
32+
env: DJANGO="1.11"
33+
- python: 3.6
34+
dist: trusty
35+
sudo: false
36+
env: DJANGO="2.0"
37+
38+
- python: 3.7
39+
dist: xenial
40+
sudo: true
41+
env: DJANGO="2.0"
42+
43+
- python: pypy
44+
dist: trusty
45+
sudo: false
46+
env: DJANGO="2.0"
2647

2748
install:
2849
- pip install tox tox-travis coverage codecov
@@ -32,7 +53,7 @@ script:
3253

3354
notifications:
3455
irc:
35-
- "irc.freenode.org#django-wiki"
56+
- "irc.freenode.org#django-wiki"
3657

3758
after_success:
3859
- coverage combine

django_nyt/__init__.py

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

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

55
default_app_config = "django_nyt.apps.DjangoNytConfig"
6-
7-
8-
def notify(*args, **kwargs):
9-
"""
10-
DEPRECATED - please access django_nyt.utils.notify
11-
"""
12-
from django_nyt.utils import notify
13-
return notify(*args, **kwargs)

django_nyt/urls.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from django import VERSION as DJANGO_VERSION
2-
from django.conf.urls import include, url
1+
from django.conf.urls import include
2+
from django.conf.urls import url
33

44
from . import views
55

docs/release_notes.rst

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

4+
1.1.1
5+
-----
6+
7+
Added
8+
^^^^^
9+
10+
* Python 3.7 support :url-issue:`81`
11+
12+
Deprecations
13+
^^^^^^^^^^^^
14+
* Removed ``django_nyt.notify``, use ``django_nyt.utils.notify``
15+
16+
17+
418
1.1
519
---
620

setup.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,12 @@
2828
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
2929
'Topic :: Software Development',
3030
'Topic :: Software Development :: Libraries :: Application Frameworks',
31-
'Programming Language :: Python :: 3.4',
31+
'Programming Language :: Python',
32+
'Programming Language :: Python :: 3',
3233
'Programming Language :: Python :: 3.5',
3334
'Programming Language :: Python :: 3.6',
35+
'Programming Language :: Python :: 3.7',
36+
'Programming Language :: Python :: 3 :: Only',
3437
],
3538
include_package_data=True,
3639
)

tox.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ python =
77
3.4: py34
88
3.5: py35,lint
99
3.6: py36
10+
3.7: py37
1011

1112
[travis:env]
1213
DJANGO =
@@ -32,6 +33,7 @@ basepython =
3233
py34: python3.4
3334
py35: python3.5
3435
py36: python3.6
36+
py37: python3.7
3537

3638

3739
[testenv:lint]

0 commit comments

Comments
 (0)