Merge branch 'jsocol:main' into main

jsocol · Jan 9, 2024 · 41bf6a8 · 41bf6a8
2 parents 7ae7c9f + e113045
commit 41bf6a8
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 15 deletions.
diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml
@@ -10,7 +10,7 @@ runs:
   using: "composite"
   steps:
   - name: Set up Python
-    uses: actions/setup-python@v2
+    uses: actions/setup-python@v4
     with:
       python-version: ${{ inputs.python-version }}
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,24 +15,49 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
-        django: ['3.2', '4.0', '4.1', '4.2', 'main']
+        python-version:
+        - '3.7'
+        - '3.8'
+        - '3.9'
+        - '3.10'
+        - '3.11'
+        django:
+        - '3.2'
+        - '4.0'
+        - '4.1'
+        - '4.2'
+        - '5.0'
+        - 'main'
         exclude:
           - python-version: '3.7'
             django: '4.0'
           - python-version: '3.7'
             django: '4.1'
           - python-version: '3.7'
             django: '4.2'
+          - python-version: '3.7'
+            django: '5.0'
           - python-version: '3.7'
             django: 'main'
+          - python-version: '3.8'
+            django: '5.0'
+          - python-version: '3.9'
+            django: '5.0'
           - python-version: '3.11'
             django: '3.2'
           - python-version: '3.11'
             django: '4.0'
+          - python-version: '3.12'
+            django: '3.2'
+          - python-version: '3.12'
+            django: '4.0'
+          - python-version: '3.12'
+            django: '4.1'
+          - python-version: '3.12'
+            django: '4.2'
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - uses: ./.github/actions/test
       with:
@@ -43,9 +68,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v4
       with:
         python-version: '3.11'
 

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -38,7 +38,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,16 +11,49 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
-        django: ['3.2', '4.0', '4.1']
+        python-version:
+        - '3.7'
+        - '3.8'
+        - '3.9'
+        - '3.10'
+        - '3.11'
+        django:
+        - '3.2'
+        - '4.0'
+        - '4.1'
+        - '4.2'
+        - '5.0'
+        - 'main'
         exclude:
           - python-version: '3.7'
             django: '4.0'
           - python-version: '3.7'
             django: '4.1'
+          - python-version: '3.7'
+            django: '4.2'
+          - python-version: '3.7'
+            django: '5.0'
+          - python-version: '3.7'
+            django: 'main'
+          - python-version: '3.8'
+            django: '5.0'
+          - python-version: '3.9'
+            django: '5.0'
+          - python-version: '3.11'
+            django: '3.2'
+          - python-version: '3.11'
+            django: '4.0'
+          - python-version: '3.12'
+            django: '3.2'
+          - python-version: '3.12'
+            django: '4.0'
+          - python-version: '3.12'
+            django: '4.1'
+          - python-version: '3.12'
+            django: '4.2'
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - uses: ./.github/actions/test
       with:
@@ -32,10 +65,10 @@ jobs:
     needs: [test]
     steps:
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: 3.11
 

diff --git a/docs/cookbook/429.rst b/docs/cookbook/429.rst
@@ -38,7 +38,7 @@ must define ``RATELIMIT_VIEW`` as a dotted-path to your error view:
 
     MIDDLEWARE = (
         # ... toward the bottom ...
-        'ratelimit.middleware.RatelimitMiddleware',
+        'django_ratelimit.middleware.RatelimitMiddleware',
         # ...
     )
 

diff --git a/tox.ini b/tox.ini
@@ -3,8 +3,9 @@ envlist =
     py37-django32,
     py38-django{32,40,41,42,main},
     py39-django{32,40,41,42,main},
-    py310-django{32,40,41,42,main},
-    py311-django{41,42,main},
+    py310-django{32,40,41,42,50,main},
+    py311-django{41,42,50,main},
+    py312-django{50,main},
     pypy39-django{32,40,41,main},
 
 [testenv]
@@ -14,6 +15,7 @@ deps =
     django40: Django>=4.0,<4.1
     django41: Django>=4.1,<4.2
     django42: Django>=4.2,<4.3
+    django50: Django>=5.0a1,<5.1
     djangomain: https://github.com/django/django/archive/main.tar.gz
     asgiref>3.7.<4.0
     pymemcache>=4.0,<5.0