Skip to content

Commit 81af8fe

Browse files
authored
Merge pull request #49 from moscowpython/tech/gello_python_3_11
hello python 3.11&django4
2 parents 3f6dc37 + f81b1e9 commit 81af8fe

File tree

5 files changed

+24
-7
lines changed

5 files changed

+24
-7
lines changed

.github/workflows/pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- uses: actions/checkout@v3
1212
- uses: actions/setup-python@v3
1313
with:
14-
python-version: "3.8"
14+
python-version: "3.11"
1515
- name: Install requirements
1616
run: pip install -r requirements-dev.txt
1717
- name: Run lint

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.8-slim-buster as base
1+
FROM python:3.11-slim-buster as base
22

33
ENV PYTHONUNBUFFERED 1
44
ENV DEBIAN_FRONTEND=noninteractive

landing_page/landing_page/settings.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@
7676

7777
USE_I18N = True
7878

79-
USE_L10N = True
80-
8179
USE_THOUSAND_SEPARATOR = True
8280

8381
THOUSAND_SEPARATOR = ' '
@@ -97,3 +95,5 @@
9795
MEDIA_ROOT = os.path.join(BASE_DIR, '../media')
9896

9997
MEDIA_URL = '/media/'
98+
99+
DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Generated by Django 4.2.4 on 2023-08-17 07:32
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('mainpage', '0038_auto_20210803_1257'),
10+
]
11+
12+
operations = [
13+
migrations.AlterField(
14+
model_name='graduatestories',
15+
name='story_section',
16+
field=models.TextField(choices=[('Есть опыт, хочу освоить новый язык', 'Есть опыт, хочу освоить новый язык'), ('Хочу новый навык или работу', 'Хочу новый навык или работу'), ('Никогда не программировал', 'Никогда не программировал')], default='Никогда не программировал', help_text='В какую из секций историй', verbose_name='Раздел истории'),
17+
),
18+
]

requirements.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
Django==2.2.28
2-
Pillow==9.0.1
3-
pytz==2020.1
1+
Django==4.2.4
2+
Pillow==10.0.0

0 commit comments

Comments
 (0)