Merge pull request #69 from ambitioninc/develop

3.1.0

Author: somewes

.github/workflows/tests.yml

@@ -18,12 +18,10 @@ jobs:
         # AttributeError: module 'collections' has no attribute 'Callable'
         # https://github.com/nose-devs/nose/issues/1099
         django:
-        - 'Django~=2.2.0'
-        - 'Django~=3.0.0'
-        - 'Django~=3.1.0'
         - 'Django~=3.2.0'
         - 'Django~=4.0.0'
         - 'Django~=4.1.0'
+        - 'Django~=4.2.0'
         experimental: [false]
 #        include:
 #        - python: '3.9'
@@ -38,6 +36,8 @@ jobs:
           django: 'Django~=4.0.0'
         - python: '3.7'
           django: 'Django~=4.1.0'
+        - python: '3.7'
+          django: 'Django~=4.2.0'
     services:
       postgres:
         image: postgres:latest
@@ -53,14 +53,14 @@ jobs:
           --health-timeout 5s
           --health-retries 5
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python }}
     - name: Setup
       run: |
         python --version
-        pip install --upgrade pip wheel
+        pip install --upgrade pip wheel setuptools
         pip install -r requirements/requirements.txt
         pip install -r requirements/requirements-testing.txt
         pip install "${{ matrix.django }}"
@@ -69,7 +69,7 @@ jobs:
       env:
         DB_SETTINGS: >-
           {
-            "ENGINE":"django.db.backends.postgresql_psycopg2",
+            "ENGINE":"django.db.backends.postgresql",
             "NAME":"db_mutex",
             "USER":"postgres",
             "PASSWORD":"postgres",

db_mutex/__init__.py

@@ -1,5 +1,3 @@
 # flake8: noqa
 from .exceptions import DBMutexError, DBMutexTimeoutError
 from .version import __version__
-
-default_app_config = 'db_mutex.apps.DBMutexConfig'

db_mutex/migrations/0001_initial.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 

db_mutex/version.py

@@ -1 +1 @@
-__version__ = '3.0.0'
+__version__ = '3.1.0'

docs/release_notes.rst

@@ -1,6 +1,11 @@
 Release Notes
 =============
 
+v3.1.0
+------
+* Django 4.2
+* Drop django 2
+
 v3.0.0
 ------
 * Django 3.2. 4.0, 4.1

manage.py

@@ -1,6 +1,13 @@
 #!/usr/bin/env python
 import sys
 
+# Show warnings about django deprecations - uncomment for version upgrade testing
+import warnings
+from django.utils.deprecation import RemovedInNextVersionWarning
+warnings.filterwarnings('always', category=DeprecationWarning)
+warnings.filterwarnings('always', category=PendingDeprecationWarning)
+warnings.filterwarnings('always', category=RemovedInNextVersionWarning)
+
 from settings import configure_settings
 
 

requirements/requirements-testing.txt

@@ -1,8 +1,6 @@
 coverage
-#coveralls
 django-dynamic-fixture
 django-nose
 freezegun
-mock
 psycopg2
 flake8

requirements/requirements.txt

@@ -1 +1 @@
-Django>=2.2
+Django>=3.2

settings.py

@@ -38,24 +38,41 @@ def configure_settings():
             TEST_RUNNER='django_nose.NoseTestSuiteRunner',
             SECRET_KEY='*',
             NOSE_ARGS=['--nocapture', '--nologcapture', '--verbosity=1'],
-            MIDDLEWARE_CLASSES=(),
             DATABASES={
                 'default': db_config,
             },
             INSTALLED_APPS=(
                 'django.contrib.auth',
                 'django.contrib.contenttypes',
                 'django.contrib.sessions',
+                'django.contrib.messages',
                 'django.contrib.admin',
                 'db_mutex',
                 'db_mutex.tests',
                 'django_nose',
             ),
             DEBUG=False,
+            DEFAULT_AUTO_FIELD='django.db.models.AutoField',
             CACHES={
                 'default': {
                     'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
                     'LOCATION': 'unique-snowflake'
                 }
-            }
+            },
+            MIDDLEWARE = (
+                'django.contrib.auth.middleware.AuthenticationMiddleware',
+                'django.contrib.messages.middleware.MessageMiddleware',
+                'django.contrib.sessions.middleware.SessionMiddleware'
+            ),
+            TEMPLATES = [{
+                'BACKEND': 'django.template.backends.django.DjangoTemplates',
+                'APP_DIRS': True,
+                'OPTIONS': {
+                    'context_processors': [
+                        'django.contrib.auth.context_processors.auth',
+                        'django.contrib.messages.context_processors.messages',
+                        'django.template.context_processors.request',
+                    ]
+                }
+            }],
         )

setup.py

@@ -45,12 +45,10 @@ def get_lines(file_path):
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Framework :: Django',
-        'Framework :: Django :: 2.2',
-        'Framework :: Django :: 3.0',
-        'Framework :: Django :: 3.1',
         'Framework :: Django :: 3.2',
         'Framework :: Django :: 4.0',
         'Framework :: Django :: 4.1',
+        'Framework :: Django :: 4.2',
     ],
     license='MIT',
     install_requires=install_requires,