Restructure CI & tox configuration

This commit restructures the configuration of GH Actions CI and tox
by offloading the testing matrix to tox and letting the GH CI decide
only the Python and ES versions

Author: sximba

.github/workflows/ci.yml

@@ -7,20 +7,32 @@ on:
 
 jobs:
   test:
+    name: Python ${{ matrix.python-version }} - ES ${{ matrix.es-version }}
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
 
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
-        django-version: ["3.2", "4.1", "4.2"]
-        es-dsl-version: ["6.4", "7.4"]
-        es-version: ["8.10.2"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        django-version: ["4.2", "4.2.8", "5.0", "5.1", "5.1.3", "5.2"]
+        es-version: ["8.18.2"]
 
         exclude:
-          - python-version: "3.11"
-            django-version: "3.2"
+          - django-version: "4.2"
+            python-version: "3.12"
+          - django-version: "4.2"
+            python-version: "3.13"
+          - django-version: "4.2.8"
+            python-version: "3.13"
+          - django-version: "5.0"
+            python-version: "3.9"
+          - django-version: "5.1"
+            python-version: "3.9"
+          - django-version: "5.1.3"
+            python-version: "3.9"
+          - django-version: "5.2"
+            python-version: "3.9"
 
     steps:
       - name: Install and Run Elasticsearch
@@ -31,7 +43,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -46,13 +58,11 @@ jobs:
       - name: Install Dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install "Django==${{ matrix.django-version }}"
-          python -m pip install "elasticsearch-dsl==${{ matrix.es-dsl-version }}"
           python -m pip install -r requirements_test.txt
 
-      - name: Run tests with Python ${{ matrix.python-version }} and Django ${{ matrix.django-version }} and elasticsearch-dsl-py ${{ matrix.es-dsl-version }}
+      - name: Run tox targets for ${{ matrix.python-version }}
         run: |
-          TOX_ENV=$(echo "py${{ matrix.python-version }}-django-${{ matrix.django-version }}-es${{ matrix.es-dsl-version }}" | tr -d .)
+          TOX_ENV=$(echo "py${{ matrix.python-version }}-dj${{ matrix.django-version }}" | tr -d .)
           python -m tox -e $TOX_ENV -- --elasticsearch
           python -m tox -e $TOX_ENV -- --elasticsearch --signal-processor celery
 

.readthedocs.yml

@@ -6,4 +6,4 @@ sphinx:
 formats: all
 
 python:
-  version: 3.8
+  version: 3.9

README.rst

@@ -30,19 +30,17 @@ Features
 - Index fast using `parallel` indexing.
 - Requirements
 
-   - Django >= 3.2
-   - Python 3.8, 3.9, 3.10, 3.11
+   - Django >= 4.2
+   - Python 3.9, 3.10, 3.11, 3.12, 3.13
 
 **Elasticsearch Compatibility:**
-The library is compatible with all Elasticsearch versions since 5.x
+The library is compatible with all Elasticsearch versions since 7.x
 **but you have to use a matching major version:**
 
 - For Elasticsearch 8.0 and later, use the major version 8 (8.x.y) of the library.
 
 - For Elasticsearch 7.0 and later, use the major version 7 (7.x.y) of the library.
 
-- For Elasticsearch 6.0 and later, use the major version 6 (6.x.y) of the library.
-
 .. code-block:: python
 
     # Elasticsearch 8.x
@@ -51,7 +49,4 @@ The library is compatible with all Elasticsearch versions since 5.x
     # Elasticsearch 7.x
     elasticsearch-dsl>=7.0.0,<8.0.0
 
-    # Elasticsearch 6.x
-    elasticsearch-dsl>=6.0.0,<7.0.0
-
 .. _Search: http://elasticsearch-dsl.readthedocs.io/en/stable/search_dsl.html

requirements.txt

@@ -1,2 +1,2 @@
-django>=3.2
-elasticsearch-dsl>=8.0.0,<9.0.0
+django>=4.2
+elasticsearch-dsl>=8.9.0,<=8.17.1

requirements_dev.txt

@@ -1,7 +1,7 @@
 bumpversion==0.6.0
-wheel==0.41.2
-django>=3.2
-elasticsearch-dsl>=7.0.0,<8.0.0
+wheel==0.45.1
+django>=4.2
+elasticsearch-dsl>=8.9.0,<=8.17.1
 twine
 sphinx
 -e .

requirements_test.txt

@@ -1,8 +1,9 @@
-coverage==7.3.1
-mock>=1.0.1
-flake8>=2.1.0
-tox>=1.7.0
-Pillow==10.0.0
-celery>=4.1.0
+coverage>=7.9.1
+mock>=5.2.0
+flake8>=7.3.0
+setuptools
+tox
+Pillow>=11.0.0
+celery>=5.5.3
 
 # Additional test requirements go here

tox.ini

@@ -1,7 +1,9 @@
 [tox]
 envlist =
-    py{38,39,310}-django-{32,41,42}-{es64,es74}
-    py{311}-django-{41,42}-{es64,es74}
+    py{39,310,311}-dj{42}
+    py{39,310,311,312}-dj{428}
+    py{310,311,312}-dj{50,51}
+    py{310,311,312,313}-dj{513,52}
 
 
 [testenv]
@@ -10,15 +12,10 @@ setenv =
 commands = coverage run --source django_elasticsearch_dsl runtests.py {posargs}
 
 deps =
-    django-32: Django>=3.2,<3.3
-    django-41: Django>=4.1,<4.2
-    django-42: Django>=4.2,<4.3
-    es64: elasticsearch-dsl>=6.4.0,<7.0.0
-    es74: elasticsearch-dsl>=7.4.0,<8
+    dj42: Django>=4.2,<4.2.8
+    dj428: Django>=4.2.8,<5.0
+    dj50: Django>=5.0,<5.1
+    dj51: Django>=5.1,<5.1.3
+    dj513: Django>=5.1.3,<5.2
+    dj52: Django>=5.2,<5.3
     -r{toxinidir}/requirements_test.txt
-
-basepython =
-    py38: python3.8
-    py39: python3.9
-    py310: python3.10
-    py311: python3.11