Skip to content

Commit

Permalink
Merge pull request pycontw#1109 from tyuchx/tw-2023-dev-yucheng
Browse files Browse the repository at this point in the history
feat(pycontw-2023): add pycontw-2023
  • Loading branch information
josix committed Jan 6, 2023
2 parents 2970d1f + 4eb3b9f commit 9cff388
Show file tree
Hide file tree
Showing 244 changed files with 18,658 additions and 39 deletions.
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ version: "3.5"
services:
web:
build: .
container_name: pycontw-2022
hostname: pycontw-2022
container_name: pycontw-2023
hostname: pycontw-2023
entrypoint: ""
command:
# Hacky script for quick demonstration purpose
Expand All @@ -26,7 +26,7 @@ services:
restart: always
environment:
# Save us from having to type `--setting=pycontw2016.settings.production`
DJANGO_SETTINGS_MODULE: pycontw2016.settings.production.pycontw2022
DJANGO_SETTINGS_MODULE: pycontw2016.settings.production.pycontw2023
SCRIPT_NAME: /prs
SECRET_KEY: ${SECRET_KEY}
DATABASE_URL: ${DATABASE_URL}
Expand All @@ -43,4 +43,4 @@ services:
networks:
network:
external: true
name: network-2022
name: network-2023
2 changes: 0 additions & 2 deletions src/core/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,6 @@ class EventInfo(models.Model):
LANGUAGE_CHOICES = (
('ENEN', _('English talk')),
('ZHEN', _('Chinese talk w. English slides')),
('JPEN', _('Japanese talk w. English slides')), # added for PyCon APAC 2022
('NONEN', _('non-English talk w. English slides')), # for backward compatibility, can be deleted after 2022
)
language = models.CharField(
verbose_name=_('language'),
Expand Down
28 changes: 0 additions & 28 deletions src/proposals/forms/mixins.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ class Meta:
'detailed_description': SimpleMDEWidget(),
'outline': SimpleMDEWidget(),
'supplementary': SimpleMDEWidget(),
'pre_recorded_policy': forms.CheckboxInput(),
}
help_texts = {
'abstract': _(
Expand Down Expand Up @@ -134,19 +133,6 @@ class Meta:
"Have you ever been a speaker at PyCon Taiwan in the past?"

),
'pre_recorded_policy': _(
"Due to the ongoing global pandemic, <strong>PyCon APAC 2022 will "
"be held fully remote. All online talks this year will be pre-recorded "
"</strong> so we can broadcast your presentation to the audience "
"without the network troubles and the time zone differences.<br>"
"After your proposal is accepted, a pre-recording of the presentation "
"will be provided to the PyCon APAC 2022 organizing team prior to the "
"conference.<br>"
"<strong>Bonus for living in Taiwan</strong><br>"
"For speakers who reside in Taiwan, we will offer a slot and assist you "
"to record the presentation in a professional video studio in Taipei "
"(travel expenses covered)."
),
'talk_language': _(
"If your previous option is not English, please enter your speaking language"
),
Expand All @@ -164,7 +150,6 @@ class Meta:
'detailed_description': SimpleMDEWidget(),
'outline': SimpleMDEWidget(),
'supplementary': SimpleMDEWidget(),
'pre_recorded_policy': forms.CheckboxInput(),
}
help_texts = {
'duration': _(
Expand Down Expand Up @@ -245,19 +230,6 @@ class Meta:
"only for the remote attendees to watch ? (we will not release "
"audio and video of your presentation)"
),
'pre_recorded_policy': _(
"Due to the ongoing global pandemic, <strong>PyCon APAC 2022 will "
"be held fully remote. All online talks this year will be pre-recorded "
"</strong> so we can broadcast your presentation to the audience "
"without the network troubles and the time zone differences.<br>"
"After your proposal is accepted, a pre-recording of the presentation "
"will be provided to the PyCon APAC 2022 organizing team prior to the "
"conference.<br>"
"<strong>Bonus for living in Taiwan</strong><br>"
"For speakers who reside in Taiwan, we will offer a slot and assist you "
"to record the presentation in a professional video studio in Taipei "
"(travel expenses covered)."
),
'talk_language': _(
"If your previous option is not English, please enter your speaking language"
),
Expand Down
9 changes: 5 additions & 4 deletions src/pycontw2016/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,10 @@ def node_bin(name):
('pycontw-2020', _('PyCon Taiwan 2020')),
('pycontw-2021', _('PyCon Taiwan 2021')),
('pycontw-2022', _('PyCon Taiwan 2022')),
('pycontw-2023', _('PyCon Taiwan 2023')),
]

CONFERENCE_DEFAULT_SLUG = 'pycontw-2022'
CONFERENCE_DEFAULT_SLUG = 'pycontw-2023'
TEMPLATES[0]['DIRS'][1] = os.path.join(
BASE_DIR, 'templates', CONFERENCE_DEFAULT_SLUG,
)
Expand All @@ -323,13 +324,13 @@ def node_bin(name):
)

EVENTS_DAY_NAMES = collections.OrderedDict([
(datetime.date(2022, 9, 3), _('Day 1')),
(datetime.date(2022, 9, 4), _('Day 2')),
(datetime.date(2022, 9, 2), _('Day 1')),
(datetime.date(2022, 9, 3), _('Day 2')),
])

SCHEDULE_REDIRECT_URL = None

COC_VERSION = '2022.0'
COC_VERSION = '2023.0'

# Since 2021, pycon.tw has indivisual server hosting the attendee-facing pages
# (see the repo at https://github.com/pycontw/pycontw-2021) and this config
Expand Down
27 changes: 27 additions & 0 deletions src/pycontw2016/settings/production/pycontw2023.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import os
from django.utils.translation import gettext_lazy as _
from .base import BASE_DIR, STATICFILES_DIRS, TEMPLATES
from .base import * # noqa

# Override static and media URL for prefix in WSGI server.
# https://code.djangoproject.com/ticket/25598
STATIC_URL = '/prs/static/'
MEDIA_URL = '/prs/media/'

CONFERENCE_DEFAULT_SLUG = 'pycontw-2023'

TALK_PROPOSAL_DURATION_CHOICES = (
('NOPREF', _('No preference')),
('PREF15', _('Prefer 15min')),
('PREF30', _('Prefer 30min')),
('PREF45', _('Prefer 45min')),
)

TEMPLATES[0]['DIRS'][1] = os.path.join(
BASE_DIR, 'templates', CONFERENCE_DEFAULT_SLUG,
)
STATICFILES_DIRS[1] = os.path.join(
BASE_DIR, 'static', CONFERENCE_DEFAULT_SLUG, '_includes',
)

FRONTEND_HOST = 'https://tw.pycon.org/2023'
22 changes: 22 additions & 0 deletions src/pycontw2016/settings/testing/pycontw2023.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import os

from django.utils.translation import gettext_lazy as _
from .base import BASE_DIR, STATICFILES_DIRS, TEMPLATES
from .base import * # noqa


CONFERENCE_DEFAULT_SLUG = 'pycontw-2023'

TALK_PROPOSAL_DURATION_CHOICES = (
('NOPREF', _('No preference')),
('PREF15', _('Prefer 15min')),
('PREF30', _('Prefer 30min')),
('PREF45', _('Prefer 45min')),
)

TEMPLATES[0]['DIRS'][1] = os.path.join(BASE_DIR, 'templates', 'pycontw-2023')
STATICFILES_DIRS[1] = os.path.join(
BASE_DIR, 'static', CONFERENCE_DEFAULT_SLUG, '_includes',
)

EVENTS_PUBLISHED = False
Loading

0 comments on commit 9cff388

Please sign in to comment.