From e14f2bddcd3fdbdcaf57f39d7ca1b69c6c1b5b25 Mon Sep 17 00:00:00 2001 From: Siddhartha Dutta Date: Mon, 25 Sep 2023 12:42:26 +0530 Subject: [PATCH 1/3] Update 429.rst --- docs/cookbook/429.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/cookbook/429.rst b/docs/cookbook/429.rst index e79cb9a..19dcf3d 100644 --- 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', # ... ) From 83b58576177cf8066e8896e8892bbf3f36d9da20 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Wed, 25 Oct 2023 11:59:39 +0100 Subject: [PATCH 2/3] Test on Django 5.0 --- .github/workflows/ci.yml | 29 +++++++++++++++++++++++++-- .github/workflows/release.yml | 37 +++++++++++++++++++++++++++++++++-- tox.ini | 6 ++++-- 3 files changed, 66 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bdd68fb..3a858f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,8 +15,19 @@ 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' @@ -24,12 +35,26 @@ jobs: 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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d07b84e..6edfab8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,13 +11,46 @@ 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 diff --git a/tox.ini b/tox.ini index 352f489..636583e 100644 --- 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 pymemcache>=4.0,<5.0 django-redis>=5.2,<6.0 From e6312996a1e5d6d4da72827dc0914369e22b88ab Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Wed, 25 Oct 2023 12:05:49 +0100 Subject: [PATCH 3/3] Upgrade GitHub Actions actions --- .github/actions/test/action.yml | 2 +- .github/workflows/ci.yml | 6 +++--- .github/workflows/codeql.yml | 2 +- .github/workflows/release.yml | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml index 73d6392..a9bbd60 100644 --- 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 index bdd68fb..60a2198 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: django: '4.0' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ./.github/actions/test with: @@ -43,9 +43,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 index 1bfcf91..ee34d24 100644 --- 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 index d07b84e..11505ca 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: django: '4.1' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ./.github/actions/test with: @@ -32,10 +32,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