Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Django 2.2 / Python 3.7 #22

Merged
merged 1 commit into from
Aug 24, 2019
+20 −11
Merged

Update to Django 2.2 / Python 3.7 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
dist: xenial
language: python

sudo: false
Expand Down Expand Up @@ -40,18 +41,23 @@ matrix:
env: DJANGO='dj21'
- python: 3.6
env: DJANGO='dj21'
# Django dev
- python: 3.7
env: DJANGO='dj21'
# Django 2.2
- python: 3.5
env: DJANGO='djdev'
env: DJANGO='dj22'
- python: 3.6
env: DJANGO='djdev'
env: DJANGO='dj22'
- python: 3.7
env: DJANGO='dj22'

install:
- pip install tox coveralls
- "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export PY_VER=py27; fi"
- "if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then export PY_VER=py34; fi"
- "if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then export PY_VER=py35; fi"
- "if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then export PY_VER=py36; fi"
- "if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then export PY_VER=py37; fi"
- "if [[ ${DJANGO}z != 'z' ]]; then export TOX_ENV=$PY_VER-$DJANGO; fi"

script:
Expand Down
6 changes: 3 additions & 3 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ to provide a standardised approach to extending existing apps.
Supported versions
******************

Python: 2.7, 3.4, 3.5, 3.6
Django: 1.8, 1.9, 1.10, 1.11, 2.0, 2.1
Python: 2.7, 3.4, 3.5, 3.6, 3.7
Django: 1.8, 1.9, 1.10, 1.11, 2.0, 2.2

Upgrading to 0.2
****************
Expand Down Expand Up @@ -59,7 +59,7 @@ it's own data there by registering a *container* (subclass of

class TaggingAppDataContainer(AppDataContainer):
form_class = TaggingAppDataForm

def tag_string(self):
print ', '.join(t.name for t in self.public_tags)

Expand Down
6 changes: 4 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from setuptools import setup

VERSION = (0, 2, 1)
VERSION = (0, 2, 2)
__version__ = VERSION
__versionstr__ = '.'.join(map(str, VERSION))

Expand All @@ -11,7 +11,7 @@
f.close()

install_requires = [
'Django>=1.8,<2.2',
'Django>=1.8,<3.0',
]
test_requires = [
'nose',
Expand Down Expand Up @@ -39,13 +39,15 @@
'Framework :: Django :: 1.11',
'Framework :: Django :: 2.0',
'Framework :: Django :: 2.1',
'Framework :: Django :: 2.2',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Operating System :: OS Independent',
],
install_requires=install_requires,
Expand Down
7 changes: 4 additions & 3 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[tox]
envlist =
py{27,34,35}-dj{18,19,110}
py{27,34,35,36}-dj111
py{34,35,36}-dj20
py{35,36}-dj{21,dev}
py{27,34,35,36,37}-dj111
py{34,35,36,37}-dj20
py{35,36,37}-dj{21,22,dev}

[testenv]
deps =
Expand All @@ -14,6 +14,7 @@ deps =
dj111: Django>=1.11,<2.0
dj20: Django>=2.0,<2.1
dj21: Django>=2.1,<2.2
dj22: Django>=2.2,<3.0
djdev: Django
commands =
{envpython} --version
Expand Down