Add support for Django 3. Drop support for Django < 2.

sophilabs · Apr 22, 2020 · 7b90b9b · 7b90b9b
1 parent 8a785b1
commit 7b90b9b
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 81 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,18 +1,13 @@
 env:
  - TOXENV=flake8
- - TOXENV=py27-django17
- - TOXENV=py27-django18
- - TOXENV=py27-django19
- - TOXENV=py27-django110
- - TOXENV=py33-django17
- - TOXENV=py33-django18
- - TOXENV=py34-django17
- - TOXENV=py34-django18
- - TOXENV=py34-django19
- - TOXENV=py34-django110
- - TOXENV=py35-django18
- - TOXENV=py35-django19
- - TOXENV=py35-django110
+ - TOXENV=py35-django20
+ - TOXENV=py37-django20
+ - TOXENV=py35-django21
+ - TOXENV=py37-django21
+ - TOXENV=py35-django22
+ - TOXENV=py38-django22
+ - TOXENV=py36-django30
+ - TOXENV=py38-django30
 
 language: python
 
@@ -34,7 +29,7 @@ deploy:
  password:
  secure: SL52TviiKyBoJiQtAvywI3F6eJgngI0DNWa66ZZJroikTZXcp5zeO48bQCcT/g1H5dNfUsTBBc17jvE0tGu3F6WR8p9OAiHD1GIv9rn+kWJPkByHyrS5oCfmjFj81/N9F7FDwHcdt8Aide/Ik/OG8VaChE8jDKJuoA7hKumRSNg=
  on:
- condition: $TOXENV == py35-django110
+ condition: $TOXENV == py36-django30
  distributions: sdist bdist_wheel
  repo: sophilabs/django-qurl-templatetag
  tags: true
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -99,7 +99,7 @@ Before you submit a pull request, check that it meets these guidelines:
 2. If the pull request adds functionality, the docs should be updated. Put
  your new functionality into a function with a docstring, and add the
  feature to the list in README.rst.
-3. The pull request should work for Python 2.6, 2.7, 3.3, 3.4 and 3.5, and for PyPy. Check
+3. The pull request should work for Python 3.5, 3.6, 3.7 and 3.8, and for PyPy. Check
  https://travis-ci.org/sophilabs/django-qurl-templatetag/pull_requests
  and make sure that the tests pass for all supported Python versions.
 

diff --git a/HISTORY.rst b/HISTORY.rst
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,7 +2,6 @@
 include AUTHORS.rst
 
 include CONTRIBUTING.rst
-include HISTORY.rst
 include LICENSE
 include README.rst
 

diff --git a/docs/history.rst b/docs/history.rst
diff --git a/docs/index.rst b/docs/index.rst
@@ -10,7 +10,6 @@ Contents:
  installation
  usage
  contributing
- authorshistory
 
 Indices and tables
 ==================

diff --git a/qurl_templatetag/__init__.py b/qurl_templatetag/__init__.py
@@ -2,4 +2,4 @@
 
 __author__ = """Sophilabs"""
 __email__ = '[email protected]'
-__version__ = '0.0.13'
+__version__ = '0.0.14'
diff --git a/qurl_templatetag/qurl.py b/qurl_templatetag/qurl.py
@@ -1,11 +1,5 @@
 import django
-from django.utils import six
-
-if six.PY3:
- from urllib.parse import urlparse, parse_qsl, urlunparse, urlencode
-else:
- from urlparse import urlparse, parse_qsl, urlunparse
- from urllib import urlencode
+from urllib.parse import urlparse, parse_qsl, urlunparse, urlencode
 
 
 class Qurl(object):

diff --git a/requirements/dev.pip b/requirements/dev.pip
@@ -1,10 +1,8 @@
-pip==9.0.1
 bumpversion==0.5.3
-wheel==0.29.0
-watchdog==0.8.3
-flake8==3.2.0
-tox==2.4.1
-coverage==4.2
-Sphinx==1.4.8
-cryptography==1.5.3
-PyYAML==3.12
+wheel==0.34.2
+flake8==3.7.9
+tox==3.14.6
+coverage==5.1
+Sphinx==3.0.2
+cryptography==2.9.1
+PyYAML==5.3.1
diff --git a/requirements/test.pip b/requirements/test.pip
@@ -1,7 +1,7 @@
-codecov>=1.4.0
-coverage==4.1
-mock>=1.0.1
-flake8>=2.1.0
-tox>=1.7.0
-requests>=2.11.1
-requests-toolbelt==0.6.2
+codecov==2.0.22
+coverage==4.2
+mock==3.0.5
+flake8==3.7.9
+tox==3.14.6
+requests==2.23.0
+requests-toolbelt==0.9.1
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.0.13
+current_version = 0.0.14
 commit = True
 tag = True
 tag_name = {new_version}
@@ -13,4 +13,3 @@ universal = 1
 
 [flake8]
 exclude = docs
-
diff --git a/setup.py b/setup.py
@@ -6,9 +6,6 @@
 with open('README.rst') as readme_file:
  readme = readme_file.read()
 
-with open('HISTORY.rst') as history_file:
- history = history_file.read()
-
 requirements = [
  # TODO: put package requirements here
 ]
@@ -17,13 +14,13 @@
  # TODO: put package test requirements here
 ]
 
-version = '0.0.13'
+version = '0.0.14'
 
 setup(
  name='django-qurl-templatetag',
  version=version,
  description="A Django template tag to modify url's query string.",
- long_description=readme + '\n\n' + history,
+ long_description=readme,
  author='Sophilabs',
  author_email='[email protected]',
  url='https://github.com/sophilabs/django-qurl-templatetag',
@@ -43,12 +40,11 @@
  'Intended Audience :: Developers',
  'License :: OSI Approved :: MIT License',
  'Natural Language :: English',
- "Programming Language :: Python :: 2",
- 'Programming Language :: Python :: 2.7',
- 'Programming Language :: Python :: 3',
- 'Programming Language :: Python :: 3.3',
  'Programming Language :: Python :: 3.4',
  'Programming Language :: Python :: 3.5',
+ 'Programming Language :: Python :: 3.6',
+ 'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: 3.8',
  ],
  test_suite='tests',
  tests_require=test_requirements

diff --git a/tox.ini b/tox.ini
@@ -1,10 +1,10 @@
 [tox]
 envlist =
  flake8
- {py27,py33,py34}-django17
- {py27,py33,py34,py35}-django18
- {py27,py34,py35}-django19
- {py27,py34,py35}-django110
+ {py35,py37}-django20
+ {py35,py37}-django21
+ {py35,py38}-django22
+ {py36,py38}-django30
 
 [testenv:flake8]
 basepython=python
@@ -19,8 +19,8 @@ commands =
  coverage run --source qurl_templatetag runtests.py
  codecov -e TOXENV
 deps =
- django17: Django>=1.7,<1.8
- django18: Django>=1.8,<1.9
- django19: Django>=1.9,<1.10
- django110: Django>=1.10
+ django20: Django>=2.0,<2.1
+ django21: Django>=2.1,<2.2
+ django22: Django>=2.2,<3.0
+ django30: Django>=3.0
  -r{toxinidir}/requirements/test.pip