Elasticsearch <8.0

Author: benoit-chabord-cdx

.github/workflows/publish-to-test-pypi.yml

@@ -3,22 +3,51 @@ name: Publish Python 🐍 distributions 📦 to PyPI and TestPyPI
 on: push
 
 jobs:
-  build-n-publish:
-    name: Build and publish Python 🐍 distributions 📦 to PyPI and TestPyPI
-    runs-on: ubuntu-20.04
-
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - django-version: "2.2.0"
+            python-version: "3.7"
+          - django-version: "3.2.0"
+            python-version: "3.7"
+          - django-version: "4.0.0"
+            python-version: "3.7"
+          - django-version: "2.2.0"
+            python-version: "3.10"
+          - django-version: "3.2.0"
+            python-version: "3.10"
+          - django-version: "4.0.0"
+            python-version: "3.10"
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 3.9
+    - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
       with:
-        python-version: 3.9
+        python-version: ${{ matrix.python-version }}
+
+    - name: Upgrade pip version
+      run: |
+        python -m pip install -U pip
+    - name: Upgrade django version
+      run: |
+        python -m pip install "Django~=${{ matrix.django-version }}"
 
     - name: Install test requirements/linters
       run: pip install -r elastic_panel/test/requirements.txt
     - name: Run pre-commit
       run: pre-commit run --all-files
 
+
+  build-n-publish:
+    name: Build and publish Python 🐍 distributions 📦 to PyPI and TestPyPI
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
     - name: Install pypa/build
       run: >-
         python -m

README.md

@@ -9,7 +9,7 @@ About
 ------------
 
 Breaking changes:
-* django-elasticsearch-debug-toolbar 3.x is compatible with Django Debug Toolbar 3.x
+* django-elasticsearch-debug-toolbar 3.x is compatible with Django Debug Toolbar 3.x (elasticsearch <8.0.0)
 * django-elasticsearch-debug-toolbar 2.x is compatible with Django Debug Toolbar 2.x
 * django-elasticsearch-debug-toolbar 1.x is compatible with Django Debug Toolbar 1.x
 

elastic_panel/panel.py

@@ -5,7 +5,7 @@
 from debug_toolbar.panels import Panel
 from debug_toolbar.utils import ThreadCollector
 from django.templatetags.static import static
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from elasticsearch.connection.base import Connection
 
 # Patching og the orginal elasticsearch log_request

elastic_panel/test/requirements.txt

@@ -1,5 +1,5 @@
 django-debug-toolbar>=3.0
-elasticsearch
+elasticsearch<8.0.0
 
 pytest
 isort