Skip to content

Commit

Permalink
Merge pull request #81 from benjaoming/feature/python37
Browse files Browse the repository at this point in the history
Add Python 3.7 support, re-enable Travis lint check
  • Loading branch information
benjaoming authored Jul 29, 2018
2 parents 3d9ecdc + 61748ea commit cb26964
Show file tree
Hide file tree
Showing 6 changed files with 64 additions and 32 deletions.
61 changes: 41 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,49 @@
# Because Python 3.6 is available on GCE
dist: trusty

cache: pip

language: python

python:
- "3.4"
- "3.5"
- "3.6"

env:
- LINT="yes"
- DJANGO="1.11"
- DJANGO="2.0"

matrix:
exclude:
- python: "3.4"
env: LINT="yes"
- python: "3.5"
env: LINT="yes"
- python: "3.6"
include:
- python: 3.4
dist: trusty
sudo: false
env: LINT="yes"
- python: 3.4
dist: trusty
sudo: false
env: DJANGO="1.11"
- python: 3.4
dist: trusty
sudo: false
env: DJANGO="2.0"

- python: 3.5
dist: trusty
sudo: false
env: DJANGO="1.11"
- python: 3.5
dist: trusty
sudo: false
env: DJANGO="2.0"

- python: 3.6
dist: trusty
sudo: false
env: DJANGO="1.11"
- python: 3.6
dist: trusty
sudo: false
env: DJANGO="2.0"

- python: 3.7
dist: xenial
sudo: true
env: DJANGO="2.0"

- python: pypy
dist: trusty
sudo: false
env: DJANGO="2.0"

install:
- pip install tox tox-travis coverage codecov
Expand All @@ -32,7 +53,7 @@ script:

notifications:
irc:
- "irc.freenode.org#django-wiki"
- "irc.freenode.org#django-wiki"

after_success:
- coverage combine
Expand Down
10 changes: 1 addition & 9 deletions django_nyt/__init__.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
_disable_notifications = False

__version__ = "1.1"
__version__ = "1.1.1"

default_app_config = "django_nyt.apps.DjangoNytConfig"


def notify(*args, **kwargs):
"""
DEPRECATED - please access django_nyt.utils.notify
"""
from django_nyt.utils import notify
return notify(*args, **kwargs)
4 changes: 2 additions & 2 deletions django_nyt/urls.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from django import VERSION as DJANGO_VERSION
from django.conf.urls import include, url
from django.conf.urls import include
from django.conf.urls import url

from . import views

Expand Down
14 changes: 14 additions & 0 deletions docs/release_notes.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
Release Notes
=============

1.1.1
-----

Added
^^^^^

* Python 3.7 support :url-issue:`81`

Deprecations
^^^^^^^^^^^^
* Removed ``django_nyt.notify``, use ``django_nyt.utils.notify``



1.1
---

Expand Down
5 changes: 4 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,12 @@
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
'Topic :: Software Development',
'Topic :: Software Development :: Libraries :: Application Frameworks',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3 :: Only',
],
include_package_data=True,
)
2 changes: 2 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ python =
3.4: py34
3.5: py35,lint
3.6: py36
3.7: py37

[travis:env]
DJANGO =
Expand All @@ -32,6 +33,7 @@ basepython =
py34: python3.4
py35: python3.5
py36: python3.6
py37: python3.7


[testenv:lint]
Expand Down

0 comments on commit cb26964

Please sign in to comment.