Test Against Python 3.10 and Django 4.0

saadmk11 · saadmk11 · commit 92c7bf76beef · 2022-02-19T19:21:07.000+06:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,88 +9,48 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9']
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
         es-version: ['6', '7']
         include:
         - python-version: 3.6
-          tox_env: py36-django22-elasticsearch7
-          requirements: django_2_2
-        - python-version: 3.6
-          tox_env: py36-django31-elasticsearch7
-          requirements: django_3_1
-        - python-version: 3.6
-          tox_env: py36-django32-elasticsearch7
-          requirements: django_3_2
+          es-version: '7'
+          tox_env: py36-django{22,31,32}-elasticsearch7
 
         - python-version: 3.6
-          tox_env: py36-django22-elasticsearch6
-          requirements: django_2_2
-        - python-version: 3.6
-          tox_env: py36-django31-elasticsearch6
-          requirements: django_3_1
-        - python-version: 3.6
-          tox_env: py36-django32-elasticsearch6
-          requirements: django_3_2
+          es-version: '6'
+          tox_env: py36-django{22,31,32}-elasticsearch6
 
         - python-version: 3.7
-          tox_env: py37-django22-elasticsearch7
-          requirements: django_2_2
-        - python-version: 3.7
-          tox_env: py37-django31-elasticsearch7
-          requirements: django_3_1
-        - python-version: 3.7
-          tox_env: py37-django32-elasticsearch7
-          requirements: django_3_2
+          es-version: '7'
+          tox_env: py37-django{22,31,32}-elasticsearch7
 
         - python-version: 3.7
-          tox_env: py37-django22-elasticsearch6
-          requirements: django_2_2
-        - python-version: 3.7
-          tox_env: py37-django31-elasticsearch6
-          requirements: django_3_1
-        - python-version: 3.7
-          tox_env: py37-django32-elasticsearch6
-          requirements: django_3_2
+          es-version: '6'
+          tox_env: py37-django{22,31,32}-elasticsearch6
 
         - python-version: 3.8
-          tox_env: py38-django22-elasticsearch7
-          requirements: django_2_2
-        - python-version: 3.8
-          tox_env: py38-django31-elasticsearch7
-          requirements: django_3_1
-        - python-version: 3.8
-          tox_env: py38-django32-elasticsearch7
-          requirements: django_3_2
+          es-version: '7'
+          tox_env: py38-django{22,31,32,40}-elasticsearch7
 
         - python-version: 3.8
-          tox_env: py38-django22-elasticsearch6
-          requirements: django_2_2
-        - python-version: 3.8
-          tox_env: py38-django31-elasticsearch6
-          requirements: django_3_1
-        - python-version: 3.8
-          tox_env: py38-django32-elasticsearch6
-          requirements: django_3_2
+          es-version: '6'
+          tox_env: py38-django{22,31,32}-elasticsearch6
 
         - python-version: 3.9
-          tox_env: py39-django22-elasticsearch7
-          requirements: django_2_2
-        - python-version: 3.9
-          tox_env: py39-django31-elasticsearch7
-          requirements: django_3_1
-        - python-version: 3.9
-          tox_env: py39-django32-elasticsearch7
-          requirements: django_3_2
+          es-version: '7'
+          tox_env: py39-django{22,31,32,40}-elasticsearch7
 
         - python-version: 3.9
-          tox_env: py39-django22-elasticsearch6
-          requirements: django_2_2
-        - python-version: 3.9
-          tox_env: py39-django31-elasticsearch6
-          requirements: django_3_1
-        - python-version: 3.9
-          tox_env: py39-django32-elasticsearch6
-          requirements: django_3_2
+          es-version: '6'
+          tox_env: py39-django{22,31,32}-elasticsearch6
+
+        - python-version: 3.10
+          es-version: '7'
+          tox_env: py310-django{32,40}-elasticsearch7
+
+        - python-version: 3.10
+          es-version: '6'
+          tox_env: py310-django32-elasticsearch6
 
     services:
       elasticsearch:
@@ -115,16 +75,10 @@ jobs:
         python -m pip install --upgrade pip setuptools wheel
         pip install pip-tools
         python -m pip install tox
-        pip-compile examples/requirements/${{ matrix.requirements }}.in
-        pip-compile examples/requirements/elastic_${{ matrix.es-version }}x.in
-        pip-compile examples/requirements/test.in
-        python -m pip install -r examples/requirements/${{ matrix.requirements }}.txt
-        python -m pip install -r examples/requirements/elastic_${{ matrix.es-version }}x.txt
-        python -m pip install -r examples/requirements/test.txt
     - name: Run tests
       uses: nick-invision/retry@v2
       with:
-        command: tox -e ${{ matrix.tox_env }} -- --color yes
+        command: tox -r -e '${{ matrix.tox_env }}' -- --color yes
         timeout_minutes: 15
         max_attempts: 3
     - name: Upload to Codecov
diff --git a/README.rst b/README.rst
@@ -46,8 +46,8 @@ Make sure to read `FAQ <https://github.com/barseghyanartur/django-elasticsearch-
 
 Prerequisites
 =============
-- Django 2.2, 3.1 and 3.2.
-- Python 3.6, 3.7, 3.8 and 3.9.
+- Django 2.2, 3.1, 3.2 and 4.0 (Elasticsearch 7.x only).
+- Python 3.6, 3.7, 3.8, 3.9 and 3.10.
 - Elasticsearch 6.x, 7.x. For older versions use
   ``django-elasticsearch-dsl-drf`` version 0.18.
 
diff --git a/examples/requirements/django_2_2_and_elastic_7x.txt b/examples/requirements/django_2_2_and_elastic_7x.txt
@@ -30,7 +30,7 @@ django-debug-toolbar-force==0.1.8
     # via -r django_2_2.in
 django-elasticsearch-debug-toolbar==2.0.0
     # via -r django_2_2.in
-django-elasticsearch-dsl==7.1.4
+django-elasticsearch-dsl==7.2.2
     # via -r elastic_7x.in
 django-nine==0.2.4
     # via
diff --git a/examples/requirements/django_3_1_and_elastic_7x.txt b/examples/requirements/django_3_1_and_elastic_7x.txt
@@ -33,7 +33,7 @@ django-debug-toolbar-force==0.1.8
     # via -r django_3_1.in
 django-elasticsearch-debug-toolbar==2.0.0
     # via -r django_3_1.in
-django-elasticsearch-dsl==7.1.4
+django-elasticsearch-dsl==7.2.2
     # via -r elastic_7x.in
 django-nine==0.2.4
     # via
diff --git a/examples/requirements/django_3_2_and_elastic_7x.txt b/examples/requirements/django_3_2_and_elastic_7x.txt
@@ -23,7 +23,7 @@ django-debug-toolbar-force==0.1.8
     # via -r django_3_2.in
 django-elasticsearch-debug-toolbar==2.0.0
     # via -r django_3_2.in
-django-elasticsearch-dsl==7.1.4
+django-elasticsearch-dsl==7.2.2
     # via -r elastic_7x.in
 django-nine==0.2.4
     # via
diff --git a/examples/requirements/django_4_0.in b/examples/requirements/django_4_0.in
@@ -0,0 +1,7 @@
+Django>=4.0,<4.1
+django-cors-headers==3.11
+django-debug-toolbar>=3.2
+django-debug-toolbar-force>=0.1.8
+django-elasticsearch-debug-toolbar>=2.0
+django-ormex>=0.2.1
+djangorestframework>=3.13,<3.14
diff --git a/examples/requirements/django_4_0.txt b/examples/requirements/django_4_0.txt
@@ -0,0 +1,40 @@
+#
+# This file is autogenerated by pip-compile with python 3.9
+# To update, run:
+#
+#    pip-compile django_4_0.in
+#
+asgiref==3.5.0
+    # via django
+django==4.0.2
+    # via
+    #   -r django_4_0.in
+    #   django-cors-headers
+    #   django-debug-toolbar
+    #   djangorestframework
+django-cors-headers==3.11
+    # via -r django_4_0.in
+django-debug-toolbar==3.2.4
+    # via -r django_4_0.in
+django-debug-toolbar-force==0.1.8
+    # via -r django_4_0.in
+django-elasticsearch-debug-toolbar==2.0.0
+    # via -r django_4_0.in
+django-nine==0.2.5
+    # via
+    #   django-debug-toolbar-force
+    #   django-ormex
+django-ormex==0.2.1
+    # via -r django_4_0.in
+djangorestframework==3.13.1
+    # via -r django_4_0.in
+pytz==2021.3
+    # via djangorestframework
+six==1.16.0
+    # via
+    #   django-debug-toolbar-force
+    #   django-ormex
+sqlparse==0.4.2
+    # via
+    #   django
+    #   django-debug-toolbar
diff --git a/examples/requirements/django_4_0_and_elastic_6x.in b/examples/requirements/django_4_0_and_elastic_6x.in
@@ -0,0 +1,2 @@
+-r django_4_0.in
+-r elastic_6x.in
diff --git a/examples/requirements/django_4_0_and_elastic_6x.txt b/examples/requirements/django_4_0_and_elastic_6x.txt
@@ -0,0 +1,58 @@
+#
+# This file is autogenerated by pip-compile with python 3.9
+# To update, run:
+#
+#    pip-compile django_4_0_and_elastic_6x.in
+#
+asgiref==3.5.0
+    # via django
+django==4.0.2
+    # via
+    #   -r django_4_0.in
+    #   django-cors-headers
+    #   django-debug-toolbar
+    #   django-nine
+    #   djangorestframework
+django-cors-headers==3.11
+    # via -r django_4_0.in
+django-debug-toolbar==3.2.4
+    # via -r django_4_0.in
+django-debug-toolbar-force==0.1.8
+    # via -r django_4_0.in
+django-elasticsearch-debug-toolbar==2.0.0
+    # via -r django_4_0.in
+django-elasticsearch-dsl @ https://github.com/django-es/django-elasticsearch-dsl/archive/dbbbfac01e4ba85c5e991fb1c0522404f170bdc0.zip
+    # via -r elastic_6x.in
+django-nine==0.2.5
+    # via
+    #   django-debug-toolbar-force
+    #   django-ormex
+django-ormex==0.2.1
+    # via -r django_4_0.in
+djangorestframework==3.13.1
+    # via -r django_4_0.in
+elasticsearch==6.3.0
+    # via
+    #   -r elastic_6x.in
+    #   elasticsearch-dsl
+elasticsearch-dsl==6.4.0
+    # via
+    #   -r elastic_6x.in
+    #   django-elasticsearch-dsl
+python-dateutil==2.8.2
+    # via elasticsearch-dsl
+pytz==2021.3
+    # via djangorestframework
+six==1.16.0
+    # via
+    #   django-debug-toolbar-force
+    #   django-elasticsearch-dsl
+    #   django-ormex
+    #   elasticsearch-dsl
+    #   python-dateutil
+sqlparse==0.4.2
+    # via
+    #   django
+    #   django-debug-toolbar
+urllib3==1.26.8
+    # via elasticsearch
diff --git a/examples/requirements/django_4_0_and_elastic_7x.in b/examples/requirements/django_4_0_and_elastic_7x.in
@@ -0,0 +1,2 @@
+-r django_4_0.in
+-r elastic_7x.in
diff --git a/examples/requirements/django_4_0_and_elastic_7x.txt b/examples/requirements/django_4_0_and_elastic_7x.txt
@@ -0,0 +1,60 @@
+#
+# This file is autogenerated by pip-compile with python 3.9
+# To update, run:
+#
+#    pip-compile django_4_0_and_elastic_7x.in
+#
+asgiref==3.5.0
+    # via django
+certifi==2021.10.8
+    # via elasticsearch
+django==4.0.2
+    # via
+    #   -r django_4_0.in
+    #   django-cors-headers
+    #   django-debug-toolbar
+    #   django-nine
+    #   djangorestframework
+django-cors-headers==3.11
+    # via -r django_4_0.in
+django-debug-toolbar==3.2.4
+    # via -r django_4_0.in
+django-debug-toolbar-force==0.1.8
+    # via -r django_4_0.in
+django-elasticsearch-debug-toolbar==2.0.0
+    # via -r django_4_0.in
+django-elasticsearch-dsl==7.2.2
+    # via -r elastic_7x.in
+django-nine==0.2.5
+    # via
+    #   django-debug-toolbar-force
+    #   django-ormex
+django-ormex==0.2.1
+    # via -r django_4_0.in
+djangorestframework==3.13.1
+    # via -r django_4_0.in
+elasticsearch==7.10.1
+    # via
+    #   -r elastic_7x.in
+    #   elasticsearch-dsl
+elasticsearch-dsl==7.3.0
+    # via
+    #   -r elastic_7x.in
+    #   django-elasticsearch-dsl
+python-dateutil==2.8.2
+    # via elasticsearch-dsl
+pytz==2021.3
+    # via djangorestframework
+six==1.16.0
+    # via
+    #   django-debug-toolbar-force
+    #   django-elasticsearch-dsl
+    #   django-ormex
+    #   elasticsearch-dsl
+    #   python-dateutil
+sqlparse==0.4.2
+    # via
+    #   django
+    #   django-debug-toolbar
+urllib3==1.26.8
+    # via elasticsearch
diff --git a/examples/requirements/elastic.txt b/examples/requirements/elastic.txt
@@ -6,7 +6,7 @@
 #
 certifi==2021.5.30
     # via elasticsearch
-django-elasticsearch-dsl==7.1.4
+django-elasticsearch-dsl==7.2.2
     # via -r elastic_7x.in
 elasticsearch==7.10.1
     # via
diff --git a/examples/requirements/elastic_7x.in b/examples/requirements/elastic_7x.in
@@ -1,3 +1,3 @@
 elasticsearch==7.10.1  #7.0.2
 elasticsearch-dsl==7.3.0  #7.0.0
-django-elasticsearch-dsl==7.1.4
+django-elasticsearch-dsl==7.2.2
diff --git a/examples/requirements/elastic_7x.txt b/examples/requirements/elastic_7x.txt
@@ -6,7 +6,7 @@
 #
 certifi==2021.5.30
     # via elasticsearch
-django-elasticsearch-dsl==7.1.4
+django-elasticsearch-dsl==7.2.2
     # via -r elastic_7x.in
 elasticsearch==7.10.1
     # via
diff --git a/examples/requirements/elastic_docker.in b/examples/requirements/elastic_docker.in
@@ -1,3 +1,3 @@
 elasticsearch==7.5.1
 elasticsearch-dsl==7.1.0
-django-elasticsearch-dsl==7.1.1
+django-elasticsearch-dsl==7.2.2
diff --git a/examples/simple/books/urls.py b/examples/simple/books/urls.py
diff --git a/examples/simple/search_indexes/urls.py b/examples/simple/search_indexes/urls.py
diff --git a/examples/simple/urls.py b/examples/simple/urls.py
diff --git a/scripts/compile_requirements.sh b/scripts/compile_requirements.sh
diff --git a/setup.py b/setup.py
diff --git a/tox.ini b/tox.ini

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+-r django_4_0.in`
	`2`	`+-r elastic_6x.in`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+-r django_4_0.in`
	`2`	`+-r elastic_7x.in`