Merge branch 'django-2.2'

Author: mjnaderi

.travis.yml

@@ -2,16 +2,6 @@ language: python
 sudo: required
 dist: xenial
 
-python:
-  - 3.5
-  - 3.6
-  - 3.7
-
-env:
-  - DJANGO=2.0
-  - DJANGO=2.1
-  - DJANGO=master
-
 matrix:
   include:
     - python: 2.7
@@ -34,6 +24,31 @@ matrix:
 
     - python: 3.4
       env: DJANGO=2.0
+    - python: 3.5
+      env: DJANGO=2.0
+    - python: 3.6
+      env: DJANGO=2.0
+    - python: 3.7
+      env: DJANGO=2.0
+
+    - python: 3.5
+      env: DJANGO=2.1
+    - python: 3.6
+      env: DJANGO=2.1
+    - python: 3.7
+      env: DJANGO=2.1
+
+    - python: 3.5
+      env: DJANGO=2.2
+    - python: 3.6
+      env: DJANGO=2.2
+    - python: 3.7
+      env: DJANGO=2.2
+
+    - python: 3.6
+      env: DJANGO=master
+    - python: 3.7
+      env: DJANGO=master
 
   allow_failures:
     - env: DJANGO=master

README.rst

@@ -39,22 +39,22 @@ Here is a brief comparison between Django's session backends (db, cache, cached_
 
 
 
-Requirements
-============
-
-+----------------+----------------------+
-| Python version | Django versions      |
-+================+======================+
-| 3.7            | 2.0, 2.1             |
-+----------------+----------------------+
-| 3.6            | 1.10, 1.11, 2.0, 2.1 |
-+----------------+----------------------+
-| 3.5            | 1.10, 1.11, 2.0, 2.1 |
-+----------------+----------------------+
-| 3.4            | 1.10, 1.11, 2.0      |
-+----------------+----------------------+
-| 2.7            | 1.10, 1.11           |
-+----------------+----------------------+
+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                |
++----------------+---------------------------+
 
 Installation
 ============

setup.py

@@ -16,7 +16,7 @@
 
 setup(
     name='django-qsessions',
-    version='0.2.0',
+    version='0.2.1',
     description='Extends Django\'s cached_db session backend',
     long_description=README,
     author='Mohammad Javad Naderi',

tests/settings.py

@@ -10,13 +10,15 @@
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'qsessions',
+    'django.contrib.messages',
 ]
 
 MIDDLEWARE = [
     'qsessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
 ]
 
 ROOT_URLCONF = 'tests.urls'

tests/test_model.py

@@ -11,7 +11,9 @@
 
 
 @pytest.mark.django_db
-def test_get_decoded():
+def test_get_decoded(django_user_model):
+    django_user_model.objects.create_user(username='test_user')
+
     store = SessionStore(user_agent='TestUA/1.1', ip='127.0.0.1')
     store[auth.SESSION_KEY] = 1
     store['foo'] = 'bar'

tests/test_sessionstore.py

@@ -15,24 +15,26 @@ def setup_store():
 
 
 def test_untouched_init(store):
-    assert store.modified == False
-    assert store.accessed == False
+    assert store.modified is False
+    assert store.accessed is False
 
 
 def test_auth_session_key(store):
     assert auth.SESSION_KEY not in store
-    assert store.modified == False
-    assert store.accessed == True
+    assert store.modified is False
+    assert store.accessed is True
 
     store.get(auth.SESSION_KEY)
-    assert store.modified == False
+    assert store.modified is False
 
     store[auth.SESSION_KEY] = 1
-    assert store.modified == True
+    assert store.modified is True
 
 
 @pytest.mark.django_db
-def test_save(store):
+def test_save(store, django_user_model):
+    django_user_model.objects.create_user(username='test_user')
+
     store[auth.SESSION_KEY] = 1
     store.save()
 
@@ -44,7 +46,9 @@ def test_save(store):
 
 
 @pytest.mark.django_db
-def test_load_unmodified(store):
+def test_load_unmodified(store, django_user_model):
+    django_user_model.objects.create_user(username='test_user')
+
     store[auth.SESSION_KEY] = 1
     store.save()
     store2 = SessionStore(session_key=store.session_key,
@@ -53,11 +57,13 @@ def test_load_unmodified(store):
     assert store2.user_agent == 'TestUA/1.1'
     assert store2.ip == '127.0.0.1'
     assert store2.get(auth.SESSION_KEY) == 1
-    assert store2.modified == False
+    assert store2.modified is False
 
 
 @pytest.mark.django_db
-def test_load_modified(store):
+def test_load_modified(store, django_user_model):
+    django_user_model.objects.create_user(username='test_user')
+
     store[auth.SESSION_KEY] = 1
     store.save()
     store2 = SessionStore(session_key=store.session_key,
@@ -66,7 +72,7 @@ def test_load_modified(store):
     assert store2.user_agent == 'TestUA/1.1'
     assert store2.ip == '8.8.8.8'
     assert store2.get(auth.SESSION_KEY) == 1
-    assert store2.modified == True
+    assert store2.modified is True
 
 
 @pytest.mark.django_db

tests/test_system_checks.py

@@ -0,0 +1,5 @@
+from django.core.management import call_command
+
+
+def test_system_checks():
+    call_command('check')

tox.ini

@@ -4,7 +4,8 @@ envlist =
     py{27,34,35,36}-dj111,
     py{34,35,36,37}-dj20,
     py{35,36,37}-dj21,
-    py{35,36,37}-{djmaster}
+    py{35,36,37}-dj22,
+    py{36,37}-{djmaster}
 
 [travis]
 unignore_outcomes = True
@@ -15,6 +16,7 @@ DJANGO =
     1.11: dj111
     2.0: dj20
     2.1: dj21
+    2.2: dj22
     master: djmaster
 
 [testenv]
@@ -26,6 +28,7 @@ deps=
     dj111: Django>=1.11,<2.0
     dj20: Django>=2.0,<2.1
     dj21: Django>=2.1,<2.2
+    dj22: Django>=2.2.1,<2.3
     djmaster: https://github.com/django/django/archive/master.tar.gz
 ignore_outcome =
     djmaster: True