Skip to content

Commit 62eddf9

Browse files
Dev (#7)
* Upgrade reqs * Fixes in tox
1 parent 9184e8c commit 62eddf9

File tree

8 files changed

+19
-23
lines changed

8 files changed

+19
-23
lines changed

examples/requirements/deployment.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ tomli==1.2.2
6464
# via pep517
6565
tqdm==4.62.3
6666
# via twine
67-
twine==3.6.0
67+
twine==3.7.0
6868
# via -r deployment.in
6969
urllib3==1.26.7
7070
# via requests

examples/requirements/django_2_2.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ Django>=2.2,<2.3
55
django-debug-toolbar>=1.6
66
django-debug-toolbar-force>=0.1.1
77
django-ormex>=0.2
8-
djangorestframework==3.9.2
9-
#djangorestframework==3.12.4
8+
djangorestframework>=3.9.2,<3.10

examples/requirements/django_2_2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ django-nine==0.2.5
2929
# django-ormex
3030
django-ormex==0.2.1
3131
# via -r django_2_2.in
32-
djangorestframework==3.9.2
32+
djangorestframework==3.9.4
3333
# via -r django_2_2.in
3434
factory-boy==3.2.1
3535
# via -r test.in

examples/requirements/django_3_0.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ Django>=3.0,<3.1
55
django-debug-toolbar>=2.1
66
django-debug-toolbar-force>=0.1.7
77
django-ormex>=0.2.1
8-
djangorestframework==3.11.0
8+
djangorestframework>=3.11.0,<3.12

examples/requirements/django_3_0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ django-nine==0.2.5
3232
# django-ormex
3333
django-ormex==0.2.1
3434
# via -r django_3_0.in
35-
djangorestframework==3.11.0
35+
djangorestframework==3.11.2
3636
# via -r django_3_0.in
3737
factory-boy==3.2.1
3838
# via -r test.in

examples/requirements/django_3_1.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ Django>=3.1,<3.2
55
django-debug-toolbar>=2.1
66
django-debug-toolbar-force>=0.1.7
77
django-ormex>=0.2.1
8-
djangorestframework==3.12.4
8+
djangorestframework>=3.12.0,<3.13

examples/requirements/django_3_2.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ Django>=3.2,<3.3
55
django-debug-toolbar>=2.1
66
django-debug-toolbar-force>=0.1.7
77
django-ormex>=0.2.1
8-
djangorestframework==3.12.4
8+
djangorestframework>=3.12.0,<3.13

tox.ini

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,22 @@
22
envlist =
33
py{36,37,38,39,310}-{django22}-djangorestframework{392}
44
py{36,37,38,39,310}-{django30}-djangorestframework{311}
5-
py{36,37,38,39,310}-{django31}-djangorestframework{311}
6-
py{36,37,38,39,310}-{django32}-djangorestframework{311}
5+
py{36,37,38,39,310}-{django31}-djangorestframework{312}
6+
py{36,37,38,39,310}-{django32}-djangorestframework{312}
77

88
[testenv]
9-
envlogdir=
10-
examples/logs/
11-
examples/db/
12-
examples/tmp/
9+
;envlogdir=
10+
; examples/logs/
11+
; examples/db/
12+
; examples/tmp/
1313
passenv = *
1414
deps =
15-
django18: -r{toxinidir}/examples/requirements/django_1_8.txt
16-
django19: -r{toxinidir}/examples/requirements/django_1_9.txt
17-
django110: -r{toxinidir}/examples/requirements/django_1_10.txt
18-
django111: -r{toxinidir}/examples/requirements/django_1_11.txt
19-
django20: -r{toxinidir}/examples/requirements/django_2_0.txt
20-
django21: -r{toxinidir}/examples/requirements/django_2_1.txt
2115
django22: -r{toxinidir}/examples/requirements/django_2_2.txt
2216
django30: -r{toxinidir}/examples/requirements/django_3_0.txt
23-
djangorestframework392: djangorestframework==3.9.2
24-
djangorestframework311: djangorestframework==3.11.0
17+
django31: -r{toxinidir}/examples/requirements/django_3_1.txt
18+
django32: -r{toxinidir}/examples/requirements/django_3_2.txt
19+
djangorestframework392: djangorestframework>=3.9.2,<3.10
20+
djangorestframework311: djangorestframework>=3.11.0,<3.12
21+
djangorestframework312: djangorestframework>=3.12.0,<3.13
2522
commands =
26-
{envpython} runtests.py
23+
{envpython} -m pytest -vvv

0 commit comments

Comments
 (0)