Add Django 4.1-4.2 and Python 3.11 support (Fixes #228)

* Increment version to 4.5.0

.github/workflows/ci.yml

@@ -12,13 +12,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
-        django-version: ['2.2', '3.2', '4.0']
+        django-version: ['3.2', '4.1', '4.2']
         exclude:
-          - python-version: '3.10'
-            django-version: '2.2'
           - python-version: '3.7'
-            django-version: '4.0'
+            django-version: '4.1'
+          - python-version: '3.7'
+            django-version: '4.2'
 
     services:
       redis:
@@ -70,7 +70,7 @@ jobs:
           ${{ matrix.python-version }}-v1-
     - name: Install dependencies
       run: |
-        sudo apt-get install -y libmemcached-dev zlib1g-dev
+        sudo apt-get install -y libmemcached-dev zlib1g-dev libpq-dev
         python -m pip install --upgrade pip wheel
         python -m pip install tox tox-gh-actions coveralls
     - name: Tox Test

.gitignore

@@ -57,6 +57,7 @@ coverage.xml
 # Django stuff:
 *.log
 local_settings.py
+*.sqlite3
 db.sqlite3
 db.sqlite3-journal
 

CHANGELOG.rst

@@ -1,6 +1,11 @@
 What’s new in django-cachalot?
 ==============================
 
+2.5.0
+-----
+
+- Dropped Django 3.2 support. Added Django 4.1-4.2 and Python 3.11 support (#229)
+
 2.4.5
 -----
 

README.rst

@@ -39,7 +39,7 @@ Table of Contents:
 Quickstart
 ----------
 
-Cachalot officially supports Python 3.7-3.10 and Django 2.2, 3.2, and 4.0 with the databases PostgreSQL, SQLite, and MySQL.
+Cachalot officially supports Python 3.7-3.11 and Django 3.2, 4.1, 4.2 with the databases PostgreSQL, SQLite, and MySQL.
 
 Note: an upper limit on Django version is set for your safety. Please do not ignore it.
 

cachalot/__init__.py

@@ -1,10 +1,4 @@
-VERSION = (2, 4, 5)
+VERSION = (2, 5, 0)
 __version__ = ".".join(map(str, VERSION))
 
-try:
+default_app_config = "cachalot.apps.CachalotConfig"
-    from django import VERSION as DJANGO_VERSION
-
-    if DJANGO_VERSION < (3, 2):
-        default_app_config = "cachalot.apps.CachalotConfig"
-except ImportError:  # pragma: no cover
-    default_app_config = "cachalot.apps.CachalotConfig"

docs/index.rst

@@ -11,8 +11,8 @@ Caches your Django ORM queries and automatically invalidates them.
 .. image:: http://img.shields.io/pypi/v/django-cachalot.svg?style=flat-square&maxAge=3600
    :target: https://pypi.python.org/pypi/django-cachalot
 
-.. image:: http://img.shields.io/travis/noripyt/django-cachalot/master.svg?style=flat-square&maxAge=3600
+.. image:: https://github.com/noripyt/django-cachalot/actions/workflows/ci.yml/badge.svg
-   :target: https://travis-ci.org/noripyt/django-cachalot
+   :target: https://github.com/noripyt/django-cachalot/actions/workflows/ci.yml
 
 .. image:: http://img.shields.io/coveralls/noripyt/django-cachalot/master.svg?style=flat-square&maxAge=3600
    :target: https://coveralls.io/r/noripyt/django-cachalot?branch=master

docs/quickstart.rst

@@ -4,8 +4,8 @@ Quick start
 Requirements
 ............
 
-- Django 2.2, 3.2, 4.0
+- Django 3.2, 4.1, 4.2
-- Python 3.7-3.10
+- Python 3.7-3.11
 - a cache configured as ``'default'`` with one of these backends:
 
   - `django-redis <https://github.com/niwinz/django-redis>`_

requirements.txt

@@ -1 +1 @@
-Django>=2.2,<4.1
+Django>=3.2,<4.3

requirements/tests.txt

@@ -2,7 +2,8 @@
 
 django>=2
 
-psycopg2-binary
+psycopg2
+psycopg
 mysqlclient
 django-redis
 python-memcached

setup.py

@@ -25,14 +25,15 @@ setup(
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
-        'Framework :: Django :: 2.2',
         'Framework :: Django :: 3.2',
-        'Framework :: Django :: 4.0',
+        'Framework :: Django :: 4.1',
+        'Framework :: Django :: 4.2',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
         'Topic :: Internet :: WWW/HTTP',
     ],
     license='BSD',

tox.ini

@@ -1,8 +1,8 @@
 [tox]
 envlist =
-    py{37,38,39}-django2.2-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased},
     py{37,38,39,310}-django3.2-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased},
-    py{38,39,310}-django4.0-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased},
+    py{38,39,310}-django4.1-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased},
+    py{38,39,310,311}-django4.2-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased},
     py{38,39,310}-djangomain-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased},
 
 [testenv]
@@ -11,12 +11,15 @@ basepython =
     py38: python3.8
     py39: python3.9
     py310: python3.10
+    py311: python3.11
 deps =
     django2.2: Django>=2.2,<2.3
     django3.2: Django>=3.2,<4.0
-    django4.0: Django>=4.0,<4.1
+    django4.1: Django>=4.1,<4.2
+    django4.2: Django>=4.2,<4.3
     djangomain: https://github.com/django/django/archive/main.tar.gz
-    psycopg2-binary>=2.8,<2.9
+    psycopg2>=2.8,<2.9
+    psycopg
     mysqlclient
     django-redis
     python-memcached
@@ -45,10 +48,11 @@ python =
     3.8: py38
     3.9: py39
     3.10: py310
+    3.11: py311
 
 [gh-actions:env]
 DJANGO =
-    2.2: django2.2
     3.2: django3.2
-    4.0: django4.0
+    4.1: django4.1
+    4.2: django4.2
     main: djangomain