Skip to content

Commit 67d89cc

Browse files
committed
Merge branch 'main' of https://github.com/jsocol/django-ratelimit into allowlist_externals
2 parents c9f79a5 + e113045 commit 67d89cc

File tree

6 files changed

+75
-15
lines changed

6 files changed

+75
-15
lines changed

.github/actions/test/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ runs:
1010
using: "composite"
1111
steps:
1212
- name: Set up Python
13-
uses: actions/setup-python@v2
13+
uses: actions/setup-python@v4
1414
with:
1515
python-version: ${{ inputs.python-version }}
1616

.github/workflows/ci.yml

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,49 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
19-
django: ['3.2', '4.0', '4.1', '4.2', 'main']
18+
python-version:
19+
- '3.7'
20+
- '3.8'
21+
- '3.9'
22+
- '3.10'
23+
- '3.11'
24+
django:
25+
- '3.2'
26+
- '4.0'
27+
- '4.1'
28+
- '4.2'
29+
- '5.0'
30+
- 'main'
2031
exclude:
2132
- python-version: '3.7'
2233
django: '4.0'
2334
- python-version: '3.7'
2435
django: '4.1'
2536
- python-version: '3.7'
2637
django: '4.2'
38+
- python-version: '3.7'
39+
django: '5.0'
2740
- python-version: '3.7'
2841
django: 'main'
42+
- python-version: '3.8'
43+
django: '5.0'
44+
- python-version: '3.9'
45+
django: '5.0'
2946
- python-version: '3.11'
3047
django: '3.2'
3148
- python-version: '3.11'
3249
django: '4.0'
50+
- python-version: '3.12'
51+
django: '3.2'
52+
- python-version: '3.12'
53+
django: '4.0'
54+
- python-version: '3.12'
55+
django: '4.1'
56+
- python-version: '3.12'
57+
django: '4.2'
3358

3459
steps:
35-
- uses: actions/checkout@v3
60+
- uses: actions/checkout@v4
3661

3762
- uses: ./.github/actions/test
3863
with:
@@ -43,9 +68,9 @@ jobs:
4368
runs-on: ubuntu-latest
4469

4570
steps:
46-
- uses: actions/checkout@v3
71+
- uses: actions/checkout@v4
4772

48-
- uses: actions/setup-python@v2
73+
- uses: actions/setup-python@v4
4974
with:
5075
python-version: '3.11'
5176

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
steps:
4040
- name: Checkout repository
41-
uses: actions/checkout@v3
41+
uses: actions/checkout@v4
4242

4343
# Initializes the CodeQL tools for scanning.
4444
- name: Initialize CodeQL

.github/workflows/release.yml

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,49 @@ jobs:
1111
strategy:
1212
fail-fast: true
1313
matrix:
14-
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
15-
django: ['3.2', '4.0', '4.1']
14+
python-version:
15+
- '3.7'
16+
- '3.8'
17+
- '3.9'
18+
- '3.10'
19+
- '3.11'
20+
django:
21+
- '3.2'
22+
- '4.0'
23+
- '4.1'
24+
- '4.2'
25+
- '5.0'
26+
- 'main'
1627
exclude:
1728
- python-version: '3.7'
1829
django: '4.0'
1930
- python-version: '3.7'
2031
django: '4.1'
32+
- python-version: '3.7'
33+
django: '4.2'
34+
- python-version: '3.7'
35+
django: '5.0'
36+
- python-version: '3.7'
37+
django: 'main'
38+
- python-version: '3.8'
39+
django: '5.0'
40+
- python-version: '3.9'
41+
django: '5.0'
42+
- python-version: '3.11'
43+
django: '3.2'
44+
- python-version: '3.11'
45+
django: '4.0'
46+
- python-version: '3.12'
47+
django: '3.2'
48+
- python-version: '3.12'
49+
django: '4.0'
50+
- python-version: '3.12'
51+
django: '4.1'
52+
- python-version: '3.12'
53+
django: '4.2'
2154

2255
steps:
23-
- uses: actions/checkout@v3
56+
- uses: actions/checkout@v4
2457

2558
- uses: ./.github/actions/test
2659
with:
@@ -32,10 +65,10 @@ jobs:
3265
needs: [test]
3366
steps:
3467

35-
- uses: actions/checkout@v3
68+
- uses: actions/checkout@v4
3669

3770
- name: Set up Python
38-
uses: actions/setup-python@v2
71+
uses: actions/setup-python@v4
3972
with:
4073
python-version: 3.11
4174

docs/cookbook/429.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ must define ``RATELIMIT_VIEW`` as a dotted-path to your error view:
3838
3939
MIDDLEWARE = (
4040
# ... toward the bottom ...
41-
'ratelimit.middleware.RatelimitMiddleware',
41+
'django_ratelimit.middleware.RatelimitMiddleware',
4242
# ...
4343
)
4444

tox.ini

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ envlist =
33
py37-django32,
44
py38-django{32,40,41,42,main},
55
py39-django{32,40,41,42,main},
6-
py310-django{32,40,41,42,main},
7-
py311-django{41,42,main},
6+
py310-django{32,40,41,42,50,main},
7+
py311-django{41,42,50,main},
8+
py312-django{50,main},
89
pypy39-django{32,40,41,main},
910

1011
[testenv]
@@ -14,6 +15,7 @@ deps =
1415
django40: Django>=4.0,<4.1
1516
django41: Django>=4.1,<4.2
1617
django42: Django>=4.2,<4.3
18+
django50: Django>=5.0a1,<5.1
1719
djangomain: https://github.com/django/django/archive/main.tar.gz
1820
pymemcache>=4.0,<5.0
1921
django-redis>=5.2,<6.0

0 commit comments

Comments
 (0)