Skip to content

Commit bddf9c8

Browse files
authored
Merge branch 'main' into nikolas-patch-12
2 parents febbce0 + 6f18c34 commit bddf9c8

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

django.mk

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ MANAGE ?= ./manage.py
2323
REQUIREMENTS ?= requirements.txt
2424
SYS_PYTHON ?= python3
2525
PY_SENTINAL ?= $(VE)/sentinal
26-
WHEEL_VERSION ?= 0.44.0
27-
PIP_VERSION ?= 24.2
26+
WHEEL_VERSION ?= 0.45.1
27+
PIP_VERSION ?= 25.1.1
28+
SETUPTOOLS_VERSION ?= 80.7.1
2829
MAX_COMPLEXITY ?= 10
2930
INTERFACE ?= localhost
3031
RUNSERVER_PORT ?= 8000
@@ -40,7 +41,7 @@ $(PY_SENTINAL): $(REQUIREMENTS)
4041
rm -rf $(VE)
4142
$(SYS_PYTHON) -m venv $(VE)
4243
$(PIP) install pip==$(PIP_VERSION)
43-
$(PIP) install --upgrade setuptools
44+
$(PIP) install setuptools==$(SETUPTOOLS_VERSION)
4445
$(PIP) install wheel==$(WHEEL_VERSION)
4546
$(PIP) install --no-deps --requirement $(REQUIREMENTS)
4647
touch $@

requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ boto3>=1.20.0,<1.36.0
99
botocore>=1.25.0,<1.39.0
1010
certifi==2025.4.26
1111
cffi==1.17.0
12-
channels==4.2.0
12+
channels==4.2.2
1313
channels-redis==4.2.0
1414
charset-normalizer==3.4.0
1515
constantly==23.10.4
1616
coverage==7.9.0
1717
cryptography==45.0.2
18-
sentry-sdk[django]==2.29.1
18+
sentry-sdk[django]==2.30.0
1919
ctlsettings==0.4.4
2020
daphne==4.2.0
2121
Deprecated==1.2.13
2222
Django==4.2.17
2323
django_statsd_mozilla==0.4.0
2424
django-smoketest==1.2.0
25-
django-storages==1.14.2
25+
django-storages==1.14.6
2626
django-ga-context==0.1.0
2727
exceptiongroup==1.3.0
2828
flake8==7.2.0
@@ -61,7 +61,7 @@ trio==0.30.0
6161
trio-websocket==0.12.1
6262
Twisted==24.11.0
6363
txaio==23.1.1
64-
typing_extensions==4.13.1
64+
typing_extensions==4.14.0
6565
urllib3==2.4.0
6666
webdriver-manager==4.0.2
6767
wrapt==1.17.0

0 commit comments

Comments
 (0)