Skip to content

Commit 85f97a3

Browse files
authored
Merge pull request #9 from Lab-Lab-Lab/django5
Django5
2 parents 1614c73 + 331dcd3 commit 85f97a3

File tree

5 files changed

+55
-55
lines changed

5 files changed

+55
-55
lines changed

config/settings/base.py

+1
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@
147147
"django.middleware.common.BrokenLinkEmailsMiddleware",
148148
"django.middleware.clickjacking.XFrameOptionsMiddleware",
149149
"reversion.middleware.RevisionMiddleware",
150+
"allauth.account.middleware.AccountMiddleware",
150151
]
151152

152153
# STATIC

requirements/base.txt

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
pytz==2021.3 # https://github.com/stub42/pytz
2-
python-slugify==5.0.2 # https://github.com/un33k/python-slugify
3-
Pillow==10.3.0 # https://github.com/python-pillow/Pillow
4-
argon2-cffi==21.3.0 # https://github.com/hynek/argon2_cffi
5-
redis==4.1.0 # https://github.com/redis/redis-py
6-
hiredis==2.3.2 # https://github.com/redis/hiredis-py
7-
uvicorn[standard]==0.29.0 # https://github.com/encode/uvicorn
1+
pytz==2024.1 # https://github.com/stub42/pytz
2+
python-slugify==8.0.4 # https://github.com/un33k/python-slugify
3+
pillow==10.4.0 # https://github.com/python-pillow/Pillow
4+
argon2-cffi==23.1.0 # https://github.com/hynek/argon2_cffi
5+
redis==5.0.7 # https://github.com/redis/redis-py
6+
hiredis==2.3.2 # https://github.com/redis/hiredis-py
7+
uvicorn==0.30.1 # https://github.com/encode/uvicorn
88

99
# Django
1010
# ------------------------------------------------------------------------------
11-
django==3.2.11 # pyup: < 4.0 # https://www.djangoproject.com/
12-
django-environ==0.8.1 # https://github.com/joke2k/django-environ
13-
django-model-utils==4.2.0 # https://github.com/jazzband/django-model-utils
14-
django-allauth==0.50.0 # https://github.com/pennersr/django-allauth
15-
django-crispy-forms==1.13.0 # https://github.com/django-crispy-forms/django-crispy-forms
16-
crispy-bootstrap5==0.6 # https://github.com/django-crispy-forms/crispy-bootstrap5
17-
django-redis==5.2.0 # https://github.com/jazzband/django-redis
18-
# Django REST Framework
19-
djangorestframework==3.13.1 # https://github.com/encode/django-rest-framework
20-
django-cors-headers==3.10.1 # https://github.com/adamchainz/django-cors-headers
11+
Django==5.0.6 # https://www.djangoproject.com/
12+
django-environ==0.11.2 # https://github.com/joke2k/django-environ
13+
django-model-utils==4.5.1 # https://github.com/jazzband/django-model-utils
14+
django-allauth==0.63.3 # https://github.com/pennersr/django-allauth
15+
django-crispy-forms==2.2 # https://github.com/django-crispy-forms/
16+
crispy-bootstrap5==2024.2 # https://github.com/django-crispy-forms/
17+
django-redis==5.4.0 # https://github.com/jazzband/django-redis
2118

22-
django-reversion==4.0.1
23-
drf-nested-routers==0.93.4
24-
django-invitations==1.9.3
25-
drf-spectacular==0.21.1
19+
# Django REST Framework
20+
djangorestframework==3.15.2 # https://github.com/encode/django-rest-framework
21+
django-cors-headers==4.4.0 # https://github.com/adamchainz/django-cors-headers
22+
django-reversion==5.0.12
23+
drf-nested-routers==0.94.1
24+
django-invitations==2.1.0
25+
drf-spectacular==0.27.2

requirements/local.txt

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
-r base.txt
22

3-
Werkzeug==2.0.2 # https://github.com/pallets/werkzeug
4-
ipdb==0.13.9 # https://github.com/gotcha/ipdb
5-
psycopg2-binary==2.9.9 # https://github.com/psycopg/psycopg2
6-
watchgod==0.7 # https://github.com/samuelcolvin/watchgod
3+
Werkzeug==3.0.3 # https://github.com/pallets/werkzeug
4+
ipdb==0.13.13 # https://github.com/gotcha/ipdb
5+
psycopg2-binary==2.9.9 # https://github.com/psycopg/psycopg2
6+
watchgod==0.8.2 # https://github.com/samuelcolvin/watchgod
77

88
# Testing
99
# ------------------------------------------------------------------------------
10-
mypy==0.930 # https://github.com/python/mypy
11-
django-stubs==1.9.0 # https://github.com/typeddjango/django-stubs
12-
pytest==6.2.5 # https://github.com/pytest-dev/pytest
13-
pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar
14-
djangorestframework-stubs==1.4.0 # https://github.com/typeddjango/djangorestframework-stubs
10+
mypy==1.10.1 #https://github.com/python/mypy
11+
django-stubs==5.0.2 # https://github.com/typeddjango/django-stubs
12+
pytest==8.2.2 # https://github.com/pytest-dev/pytest
13+
pytest-sugar==1.0.0 # https://github.com/Frozenball/pytest-sugar
14+
djangorestframework-stubs==3.15.0 # https://github.com/typeddjango/djangorestframework-stubs
1515

1616
# Documentation
1717
# ------------------------------------------------------------------------------
18-
sphinx==4.3.2 # https://github.com/sphinx-doc/sphinx
19-
sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
18+
Sphinx==7.3.7 # https://github.com/sphinx-doc/sphinx
19+
sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild
2020

2121
# Code quality
2222
# ------------------------------------------------------------------------------
23-
flake8==4.0.1 # https://github.com/PyCQA/flake8
24-
flake8-isort==4.1.1 # https://github.com/gforcada/flake8-isort
25-
coverage==6.2 # https://github.com/nedbat/coveragepy
26-
black # https://github.com/psf/black
27-
pylint-django==2.5.0 # https://github.com/PyCQA/pylint-django
28-
pre-commit==2.16.0 # https://github.com/pre-commit/pre-commit
23+
flake8==7.1.0 # https://github.com/PyCQA/flake8
24+
flake8-isort==6.1.1 # https://github.com/gforcada/flake8-isort
25+
coverage==7.5.4 # https://github.com/nedbat/coveragepy
26+
black==24.4.2 # https://github.com/psf/black
27+
pylint-django==2.5.5 # https://github.com/PyCQA/pylint-django
28+
pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit
2929

3030
# Django
3131
# ------------------------------------------------------------------------------
32-
factory-boy==3.2.1 # https://github.com/FactoryBoy/factory_boy
32+
factory-boy==3.3.0 # https://github.com/FactoryBoy/factory_boy
3333

34-
django-debug-toolbar==3.2.4 # https://github.com/jazzband/django-debug-toolbar
35-
django-extensions==3.1.5 # https://github.com/django-extensions/django-extensions
36-
django-coverage-plugin==2.0.2 # https://github.com/nedbat/django_coverage_plugin
37-
pytest-django==4.5.2 # https://github.com/pytest-dev/pytest-django
34+
django-debug-toolbar==4.4.5 # https://github.com/jazzband/django-debug-toolbar
35+
django-extensions==3.2.3 # https://github.com/django-extensions/django-extensions
36+
django-coverage-plugin==3.1.0 # https://github.com/nedbat/django_coverage_plugin
37+
pytest-django==4.8.0 # https://github.com/pytest-dev/pytest-django

requirements/production.txt

+8-8
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
-r base.txt
44

5-
wheel
6-
gunicorn==20.1.0 # https://github.com/benoitc/gunicorn
7-
psycopg2-binary==2.9.9 # https://github.com/psycopg/psycopg2
8-
Collectfast==2.2.0 # https://github.com/antonagestam/collectfast
5+
wheel==0.43.0 # https://idk
6+
gunicorn==22.0.0 # https://github.com/benoitc/gunicorn
7+
psycopg2-binary==2.9.9 # https://github.com/psycopg/psycopg2
8+
Collectfast==2.2.0 # https://github.com/antonagestam/collectfast
99

1010
# Django
1111
# ------------------------------------------------------------------------------
12-
django-storages[boto3]==1.12.3 # https://github.com/jschneier/django-storages
13-
django-anymail[amazon_ses]==8.4 # https://github.com/anymail/django-anymail
12+
django-storages==1.14.3 # https://github.com/jschneier/django-storages
13+
django-anymail==11.0 # https://github.com/anymail/django-anymail
1414

1515

16-
# httptools==0.3.0
17-
uvloop==0.19.0
16+
# httptools
17+
uvloop==0.19.0 # https://idk

teleband/courses/migrations/0003_auto_20220110_2052.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
import datetime
44
from django.db import migrations, models
55
import django.db.models.deletion
6-
from django.utils.timezone import utc
7-
6+
from zoneinfo import ZoneInfo
87

98
class Migration(migrations.Migration):
109

@@ -18,15 +17,15 @@ class Migration(migrations.Migration):
1817
model_name="course",
1918
name="end_date",
2019
field=models.DateField(
21-
default=datetime.datetime(2022, 1, 11, 1, 52, 38, 716619, tzinfo=utc)
20+
default=datetime.datetime(2022, 1, 11, 1, 52, 38, 716619, tzinfo=ZoneInfo("UTC"))
2221
),
2322
preserve_default=False,
2423
),
2524
migrations.AddField(
2625
model_name="course",
2726
name="start_date",
2827
field=models.DateField(
29-
default=datetime.datetime(2022, 1, 11, 1, 52, 44, 131728, tzinfo=utc)
28+
default=datetime.datetime(2022, 1, 11, 1, 52, 44, 131728, tzinfo=ZoneInfo("UTC"))
3029
),
3130
preserve_default=False,
3231
),

0 commit comments

Comments
 (0)