From 5355acb47f587db1f909e1b615489664f6c0d6d1 Mon Sep 17 00:00:00 2001 From: Mohammad Javad Naderi Date: Tue, 21 Jan 2020 13:46:32 +0330 Subject: [PATCH] Add django 3.0 to support matrix, bump version 0.4.0 --- .travis.yml | 9 +++++++++ CHANGELOG.md | 4 ++++ README.rst | 28 +++++++++++++++------------- setup.py | 5 +++-- tox.ini | 5 ++++- 5 files changed, 35 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 000e006..3ab9ad2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,10 +43,19 @@ matrix: - python: 3.7 env: DJANGO=2.2 + - python: 3.6 + env: DJANGO=3.0 + - python: 3.7 + env: DJANGO=3.0 + - python: 3.8 + env: DJANGO=3.0 + - python: 3.6 env: DJANGO=master - python: 3.7 env: DJANGO=master + - python: 3.8 + env: DJANGO=master allow_failures: - env: DJANGO=master diff --git a/CHANGELOG.md b/CHANGELOG.md index 86e9714..ab7875f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 0.4.0 + +- Added Django 3.0 to support matrix. + # 0.3.0 - Added `qsessions.backends.db` session backend. diff --git a/README.rst b/README.rst index 1354115..4ab03aa 100644 --- a/README.rst +++ b/README.rst @@ -42,19 +42,21 @@ Here is a brief comparison between Django's session backends (db, cache, cached_ Compatibility ============= -+----------------+---------------------------+ -| Python version | Django versions | -+================+===========================+ -| 3.7 | 2.0, 2.1, 2.2 | -+----------------+---------------------------+ -| 3.6 | 1.10, 1.11, 2.0, 2.1, 2.2 | -+----------------+---------------------------+ -| 3.5 | 1.10, 1.11, 2.0, 2.1, 2.2 | -+----------------+---------------------------+ -| 3.4 | 1.10, 1.11, 2.0 | -+----------------+---------------------------+ -| 2.7 | 1.10, 1.11 | -+----------------+---------------------------+ ++----------------+--------------------------------+ +| Python version | Django versions | ++================+================================+ +| 3.8 | 3.0 | ++----------------+--------------------------------+ +| 3.7 | 2.0, 2.1, 2.2, 3.0 | ++----------------+--------------------------------+ +| 3.6 | 1.10, 1.11, 2.0, 2.1, 2.2, 3.0 | ++----------------+--------------------------------+ +| 3.5 | 1.10, 1.11, 2.0, 2.1, 2.2 | ++----------------+--------------------------------+ +| 3.4 | 1.10, 1.11, 2.0 | ++----------------+--------------------------------+ +| 2.7 | 1.10, 1.11 | ++----------------+--------------------------------+ Installation ============ diff --git a/setup.py b/setup.py index 486e15f..639cdd4 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir))) dev_requirements = [ - 'geoip2==2.9.0', # for testing GeoIP2 + 'geoip2==3.0.0', # for testing GeoIP2 'pytest', 'pytest-cov', 'pytest-django', @@ -16,7 +16,7 @@ setup( name='django-qsessions', - version='0.3.0', + version='0.4.0', description='Extended session backends for Django', long_description=README, author='Mohammad Javad Naderi', @@ -40,6 +40,7 @@ 'Framework :: Django :: 2.0', 'Framework :: Django :: 2.1', 'Framework :: Django :: 2.2', + 'Framework :: Django :: 3.0', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Operating System :: OS Independent', diff --git a/tox.ini b/tox.ini index 9f69d16..b2fa445 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,8 @@ envlist = py{27,34,35,36}-{dj110,dj111}-{db,cached_db}, py{34,35,36,37}-dj20-{db,cached_db}, py{35,36,37}-{dj21,dj22}-{db,cached_db}, - py{36,37}-{djmaster}-{db,cached_db} + py{36,37,38}-{dj30}-{db,cached_db}, + py{36,37,38}-{djmaster}-{db,cached_db} [travis] unignore_outcomes = True @@ -15,6 +16,7 @@ DJANGO = 2.0: dj20 2.1: dj21 2.2: dj22 + 3.0: dj30 master: djmaster [testenv] @@ -29,6 +31,7 @@ deps= dj20: Django>=2.0,<2.1 dj21: Django>=2.1,<2.2 dj22: Django>=2.2,<2.3 + dj30: Django>=3.0,<3.1 djmaster: https://github.com/django/django/archive/master.tar.gz ignore_outcome = djmaster: True