Skip to content

Commit 9778b38

Browse files
authored
Merge pull request #1214 from pycontw/2025_migration
feat: update PyConTW 2024 to 2025(BackEnd)
2 parents 40d0162 + aa04cb0 commit 9778b38

197 files changed

Lines changed: 13717 additions & 11 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,5 @@ EXPOSE 8000
7474
CMD ["uwsgi", "--http-socket", ":8000", "--master", \
7575
"--hook-master-start", "unix_signal:15 gracefully_kill_them_all", \
7676
"--static-map", "/static=assets", "--static-map", "/media=media", \
77-
"--mount", "/2024=pycontw2016/wsgi.py", "--manage-script-name", \
77+
"--mount", "/2025=pycontw2016/wsgi.py", "--manage-script-name", \
7878
"--offload-threads", "2"]

docker-compose.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ services:
55
context: .
66
dockerfile: Dockerfile
77
target: prod
8-
container_name: pycontw-2024
9-
hostname: pycontw-2024
8+
container_name: pycontw-2025
9+
hostname: pycontw-2025
1010
entrypoint: ""
1111
command:
1212
# Hacky script for quick demonstration purpose
@@ -29,7 +29,7 @@ services:
2929
restart: always
3030
environment:
3131
# Save us from having to type `--setting=pycontw2016.settings.production`
32-
DJANGO_SETTINGS_MODULE: pycontw2016.settings.production.pycontw2024
32+
DJANGO_SETTINGS_MODULE: pycontw2016.settings.production.pycontw2025
3333
SCRIPT_NAME: /prs
3434
SECRET_KEY: ${SECRET_KEY}
3535
DATABASE_URL: ${DATABASE_URL}
@@ -40,9 +40,9 @@ services:
4040
volumes:
4141
- ${MEDIA_ROOT}:/usr/local/app/src/media
4242
networks:
43-
- network-2024
43+
- network-2025
4444

4545
networks:
46-
network-2024:
46+
network-2025:
4747
external: true
48-
name: network-2024
48+
name: network-2025

src/pycontw2016/settings/base.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,9 +311,10 @@ def node_bin(name):
311311
('pycontw-2022', _('PyCon Taiwan 2022')),
312312
('pycontw-2023', _('PyCon Taiwan 2023')),
313313
('pycontw-2024', _('PyCon Taiwan 2024')),
314+
('pycontw-2025', _('PyCon Taiwan 2025')),
314315
]
315316

316-
CONFERENCE_DEFAULT_SLUG = 'pycontw-2024'
317+
CONFERENCE_DEFAULT_SLUG = 'pycontw-2025'
317318
TEMPLATES[0]['DIRS'][1] = os.path.join(
318319
BASE_DIR, 'templates', CONFERENCE_DEFAULT_SLUG,
319320
)
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import os
2+
3+
from django.utils.translation import gettext_lazy as _
4+
5+
from .base import * # noqa
6+
from .base import BASE_DIR, STATICFILES_DIRS, TEMPLATES
7+
8+
# Override static and media URL for prefix in WSGI server.
9+
# https://code.djangoproject.com/ticket/25598
10+
STATIC_URL = '/prs/static/'
11+
MEDIA_URL = '/prs/media/'
12+
13+
CONFERENCE_DEFAULT_SLUG = 'pycontw-2025'
14+
15+
TALK_PROPOSAL_DURATION_CHOICES = (
16+
('NOPREF', _('No preference')),
17+
('PREF15', _('Prefer 15min')),
18+
('PREF30', _('Prefer 30min')),
19+
('PREF45', _('Prefer 45min')),
20+
)
21+
22+
TEMPLATES[0]['DIRS'][1] = os.path.join(
23+
BASE_DIR, 'templates', CONFERENCE_DEFAULT_SLUG,
24+
)
25+
STATICFILES_DIRS[1] = os.path.join(
26+
BASE_DIR, 'static', CONFERENCE_DEFAULT_SLUG, '_includes',
27+
)
28+
29+
FRONTEND_HOST = 'https://tw.pycon.org/2025'
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import os
2+
3+
from django.utils.translation import gettext_lazy as _
4+
5+
from .base import * # noqa
6+
from .base import BASE_DIR, STATICFILES_DIRS, TEMPLATES
7+
8+
CONFERENCE_DEFAULT_SLUG = 'pycontw-2025'
9+
10+
TALK_PROPOSAL_DURATION_CHOICES = (
11+
('NOPREF', _('No preference')),
12+
('PREF15', _('Prefer 15min')),
13+
('PREF30', _('Prefer 30min')),
14+
('PREF45', _('Prefer 45min')),
15+
)
16+
17+
TEMPLATES[0]['DIRS'][1] = os.path.join(BASE_DIR, 'templates', 'pycontw-2025')
18+
STATICFILES_DIRS[1] = os.path.join(
19+
BASE_DIR, 'static', CONFERENCE_DEFAULT_SLUG, '_includes',
20+
)
21+
22+
EVENTS_PUBLISHED = False

0 commit comments

Comments
 (0)