Skip to content

Commit ead1b3e

Browse files
Bump dev dependencies, fix CI installing django from $DJANGO_VERSION (#209)
* Bump dev dependencies * Fix install from DJANGO_VERSION
1 parent 56681a8 commit ead1b3e

File tree

4 files changed

+21
-9
lines changed

4 files changed

+21
-9
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ install:
2727
python3 -m venv ${venv}
2828
${bin}pip install -U pip wheel
2929
${bin}pip install -r requirements.txt
30+
./tools/install_django.sh ${bin}pip
3031

3132
format:
3233
${bin}autoflake --in-place --recursive ${pysources}

requirements.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
-e .
22

33
# Django environment.
4-
django[argon2,bcrypt]==3.2.*
5-
djangorestframework==3.12.*
4+
# django[argon2,bcrypt] # See tools/install_django.sh
5+
djangorestframework==3.13.1
66
dj-database-url
77
django-dotenv
88

@@ -20,11 +20,11 @@ flake8
2020
flake8-bugbear
2121
flake8-comprehensions
2222
isort==5.*
23-
mkdocs==1.*
24-
mkdocs-material==8.*
25-
pymdown-extensions==9.*
23+
mkdocs==1.3.0
24+
mkdocs-material==8.3.1
25+
pymdown-extensions==9.4
2626
mypy
27-
pytest==6.*
28-
pytest-django==4.*
27+
pytest==7.1.2
28+
pytest-django==4.5.2
2929
pytest-cov
3030
seed-isort-config

tests/test_admin.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from django.contrib.messages.middleware import MessageMiddleware
55
from django.contrib.sessions.middleware import SessionMiddleware
66
from django.http.request import HttpRequest
7+
from django.http.response import HttpResponse
78
from django.test import RequestFactory
89
from test_project.heroes.admin import HeroAPIKeyModelAdmin
910
from test_project.heroes.models import Hero, HeroAPIKey
@@ -15,10 +16,13 @@
1516
def build_admin_request(rf: RequestFactory) -> HttpRequest:
1617
request = rf.post("/")
1718

19+
def get_response(request: HttpRequest) -> HttpResponse:
20+
raise NotImplementedError # Unused in these tests.
21+
1822
# NOTE: all middleware must be instantiated before
1923
# any middleware can process the request.
20-
sessions = SessionMiddleware()
21-
messages = MessageMiddleware()
24+
sessions = SessionMiddleware(get_response)
25+
messages = MessageMiddleware(sessions.get_response)
2226

2327
sessions.process_request(request)
2428
messages.process_request(request)

tools/install_django.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/sh -ex
2+
3+
PIP="$1"
4+
5+
DJANGO_VERSION=${DJANGO_VERSION:-4.0.5}
6+
7+
exec ${PIP} install django[argon2,bcrypt]==$DJANGO_VERSION

0 commit comments

Comments
 (0)