Skip to content

Commit

Permalink
Travis: Django 2.2 and up, Add 3.0 (#48)
Browse files Browse the repository at this point in the history
Also, tests are now ran against django-classy-tags at 1.0, where
django 3.0 compatibility is fixed.
  • Loading branch information
tony committed Jan 26, 2020
2 parents 88bc5cd + 179316e commit f6a1ee6
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 42 deletions.
22 changes: 2 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,10 @@ matrix:
- python: 3.6
env: TOXENV=py36-isort

- python: 2.7
env: TOXENV=py27-dj18
- python: 3.5
env: TOXENV=py35-dj18

- python: 2.7
env: TOXENV=py27-dj110

- python: 2.7
env: TOXENV=py27-dj111
- python: 3.5
env: TOXENV=py35-dj111
- python: 3.6
env: TOXENV=py36-dj111

- python: 3.5
env: TOXENV=py35-dj20
- python: 3.6
env: TOXENV=py36-dj20

- python: 3.6
env: TOXENV=py36-dj22
- python: 3.6
env: TOXENV=py36-dj30

- python: 3.6
env: TOXENV=py36-djmaster
Expand Down
5 changes: 0 additions & 5 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@

extensions = []

releases_unstable_prehistory = True
releases_document_name = "history"
releases_issue_uri = "https://github.com/hellysmile/django-activeurl/issues/%s"
releases_release_uri = "https://github.com/hellysmile/django-activeurl/tree/v%s"

templates_path = ['_templates']

source_suffix = '.rst'
Expand Down
12 changes: 5 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@
from __future__ import unicode_literals

import io
import sys

from setuptools import setup

PY_27 = sys.version_info < (3, 0, 0)

about = {}
with io.open('django_activeurl/__about__.py', encoding='utf-8') as fp:
exec(fp.read(), about)
Expand Down Expand Up @@ -49,10 +46,11 @@ def long_description():
]

install_requires = [
str('django<2') if PY_27 else str('django'),
str('lxml'),
str('django-classy-tags'),
str('django_appconf'),
'django<2;python_version<"3"',
'django;python_version>"2"',
'lxml',
'django-classy-tags',
'django_appconf',
]


Expand Down
12 changes: 2 additions & 10 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
[tox]
envlist =
{py27,py36}-isort
{py27,py36}-flake8
{py27,py35}-dj18
{py27}-dj110
{py27y35,py36}-dj111
{py35,py36}-dj20
{py36}-dj22
{py36}-dj30
{py36}-djmaster

[testenv]
Expand All @@ -16,11 +11,8 @@ deps =
pytest
pytest-cov
jinja2
dj18: Django>=1.8,<1.9
dj110: Django>=1.10,<1.11
dj111: Django>=1.11,<2.0
dj20: Django>=2.0,<2.1
dj22: Django>=2.2,<2.3
dj30: Django>=3.0,<3.1
djmaster: https://github.com/django/django/archive/master.tar.gz

[testenv:py27-flake8]
Expand Down

0 comments on commit f6a1ee6

Please sign in to comment.