Skip to content

Commit

Permalink
Dropped support for Python 2.7
Browse files Browse the repository at this point in the history
This is the simplest way to fix Jinja testing without having to do requirements shenanigans. Python 2.7+Django 1.11 may still work, but we will no longer guarantee support for that combination of Python and Django. Additionally, we are now using the latest version of django-jinja in our testing.
  • Loading branch information
clintonb committed Feb 15, 2020
1 parent 947163f commit 45c80e5
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 23 deletions.
12 changes: 5 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,16 @@ dist: bionic

matrix:
include:
- { python: "2.7", env: TOXENV=py27-django111-jinja }
- { python: "3.5", env: TOXENV=py35-django111 }

- { python: "3.5", env: TOXENV=py35-django111-jinja }

- { python: "3.6", env: TOXENV=py36-django111-jinja }
- { python: "3.6", env: TOXENV=py36-django22-jinja }
- { python: "3.6", env: TOXENV=py36-django111 }
- { python: "3.6", env: TOXENV=py36-django22 }
- { python: "3.6", env: TOXENV=py36-django30 }

- { python: "3.7", env: TOXENV=py37-django22-jinja }
- { python: "3.7", env: TOXENV=py37-django22 }
- { python: "3.7", env: TOXENV=py37-django30 }

- { python: "3.8", env: TOXENV=py38-django22-jinja }
- { python: "3.8", env: TOXENV=py38-django22 }
- { python: "3.8", env: TOXENV=py38-django30 }

- { python: "3.8", env: TOXENV=i18n }
Expand Down
3 changes: 2 additions & 1 deletion CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ Waffle Changelog

v0.19.1
=======
- Removed deprection warnings for ugettext.
- Dropped support for Python 2.7
- Removed deprecation warnings for ugettext.

v0.19.0
=======
Expand Down
4 changes: 1 addition & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
package_data={'': ['README.rst']},
zip_safe=False,
classifiers=[
'Development Status :: 4 - Beta',
'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment',
'Framework :: Django',
'Intended Audience :: Developers',
Expand All @@ -25,8 +25,6 @@
'Framework :: Django :: 2.0',
'Framework :: Django :: 3.0',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
Expand Down
11 changes: 5 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[tox]
envlist =
py{27,34,35,36}-django111-jinja
py{34,35,36,37}-django20-jinja
py{35,36,37}-django21-jinja
py{35,36,37,38}-django22-jinja
py{35,36}-django111
py{35,36,37}-django20
py{35,36,37}-django21
py{35,36,37,38}-django22
py{36,37,38}-django30

[testenv]
Expand All @@ -12,7 +12,6 @@ deps =
django20: Django>=2.0,<2.1
django21: Django>=2.1,<2.2
django22: Django>=2.2,<2.3
jinja: -rtravis_jinja.txt
django30: Django>=3.0,<3.1
-rtravis.txt
passenv = DATABASE_URL
Expand All @@ -21,7 +20,7 @@ commands =

[testenv:i18n]
deps =
Django>=2.2,<2.3
Django>=3.0,<3.1
-rtravis.txt
commands =
./run.sh makemessages
Expand Down
7 changes: 3 additions & 4 deletions travis.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# These are the requirements for Travis, e.g. we don't specify Django
# versions.
mock==1.3.0
dj-database-url==0.5.0
django-jinja>=2.4.1,<3
Jinja2>=2.7.1
mock==1.3.0
psycopg2-binary>=2.7.7

transifex-client
2 changes: 0 additions & 2 deletions travis_jinja.txt

This file was deleted.

0 comments on commit 45c80e5

Please sign in to comment.