Skip to content

Commit f1e2fd6

Browse files
Lee-WLee-W
committed
Merge branch 'master' into prod
2 parents 55115e4 + 348c074 commit f1e2fd6

21 files changed

+3329
-1690
lines changed

‎Dockerfile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG AIRFLOW_VERSION=3.0.3
1+
ARG AIRFLOW_VERSION=3.1.2
22
ARG PYTHON_VERSION=3.10
33
ARG PLATFORM=linux
44

@@ -38,5 +38,7 @@ ENV PYTHONPATH="${AIRFLOW_HOME}:$PYTHONPATH"
3838

3939
COPY airflow.cfg ${AIRFLOW_HOME}/airflow.cfg
4040
COPY --chown=airflow:root dags ${AIRFLOW_HOME}/dags
41+
COPY --chown=airflow:root patch/0082_3_1_0_make_bundle_name_not_nullable.py /app/.venv/lib/python3.10/site-packages/airflow/migrations/versions/0082_3_1_0_make_bundle_name_not_nullable.py
42+
COPY --chown=airflow:root patch/dag.py /app/.venv/lib/python3.10/site-packages/airflow/models/dag.py
4143

4244
ENTRYPOINT ["/entrypoint.sh"]

‎Dockerfile.test‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG AIRFLOW_VERSION=3.0.3
1+
ARG AIRFLOW_VERSION=3.1.2
22
ARG PYTHON_VERSION=3.10
33
ARG PLATFORM=linux
44

@@ -38,6 +38,8 @@ ENV PYTHONPATH="${AIRFLOW_HOME}:$PYTHONPATH"
3838

3939
COPY airflow.cfg ${AIRFLOW_HOME}/airflow.cfg
4040
COPY --chown=airflow:root dags ${AIRFLOW_HOME}/dags
41+
COPY --chown=airflow:root patch/0082_3_1_0_make_bundle_name_not_nullable.py /app/.venv/lib/python3.10/site-packages/airflow/migrations/versions/0082_3_1_0_make_bundle_name_not_nullable.py
42+
COPY --chown=airflow:root patch/dag.py /app/.venv/lib/python3.10/site-packages/airflow/models/dag.py
4143

4244
ENV AIRFLOW_TEST_MODE=True
4345

‎cli/2025/corporate_data_field_names.txt‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Nickname / 暱稱
2+
Gender / 生理性別
3+
Size of T-Shirt / 衣服尺寸 (For tickets with t-shirt should fill in this field / 票種有含紀念衣服需填寫)
4+
Dietary Preference / 飲食偏好
5+
來自國家、地區或縣市
6+
Age range / 年齡區間
7+
Job Title / 職稱 (If you are a student, fill in "student" / 如果您是「學生」，請填寫「student」)
8+
Company / 服務單位 (For students or teachers, fill in the School + Department Name / 學校單位請填寫學校及系所名稱)
9+
Years of Using Python / 使用 Python 多久
10+
Area of Interest / 興趣領域
11+
(Attend first time) How did you know PyCon TW 2025? / (初次參與) 如何得知 PyCon TW 2025？
12+
Have you ever attended PyCon TW? / 是否曾參加 PyCon TW？
13+
I would like to donate invoice to Open Culture Foundation / 我願意捐贈發票給開放文化基金會 (Ref: https://reurl.cc/ZQ6VY6)
14+
I've already read and I accept the Privacy Policy of PyCon TW 2025 / 我已閱讀並同意 PyCon TW 2025 個人資料保護聲明
15+
I'm willing to comply with the PyCon TW 2025 CoC / 我願意遵守 PyCon TW 2025 行為準則
16+
我願意收到未來 PyCon TW 贊助機會相關信件
17+
願意收到未來 PyCon TW 活動訊息
18+
聯絡人 姓名
19+
聯絡人 Email
20+
聯絡人 手機

‎cli/2025/individual_data_field_names.txt‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Nickname / 暱稱
2+
Gender / 生理性別
3+
Size of T-shirt / 衣服尺寸 (For tickets with t-shirt should fill in this field / 票種有含紀念衣服需填寫)
4+
Dietary Preference / 飲食偏好
5+
Where are you from? / 來自國家、地區或縣市
6+
Age Range / 年齡區間
7+
Job Title / 職稱 (If you are a student, fill in "student" / 如果您是「學生」，請填寫「student」)
8+
Company / 服務單位 (For students or teachers, fill in the School + Department Name / 學校單位請填寫學校及系所名稱)
9+
Years of Using Python / 使用 Python 多久
10+
Area of Interest / 興趣領域
11+
(Attend first time) How did you know PyCon TW 2025? / (初次參與) 如何得知 PyCon TW？
12+
Have you ever attended PyCon TW? / 您是否曾參加 PyCon TW？
13+
I would like to donate invoice to Open Culture Foundation / 我願意捐贈發票給開放文化基金會 (Ref: https://reurl.cc/ZQ6VY6)
14+
I’ve already read and I accept the Privacy Policy of PyCon TW 2025 / 我已閱讀並同意 PyCon TW 2025 個人資料保護聲明
15+
I'm willing to comply with the PyCon TW 2025 CoC / 我願意遵守 PyCon TW 2025 行為準則
16+
I am willing to receive information regarding sponsorship opportunities / 我願意收到未來 PyCon TW 贊助機會相關信件
17+
I am willing to receive future updates and information about PyCon TW events / 願意收到未來 PyCon TW 活動訊息
18+
聯絡人 姓名
19+
聯絡人 Email
20+
聯絡人 手機

‎cli/2025/meta_field_mapping.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"id": "Id",
3+
"ticket_name": "票種",
4+
"reg_no": "報名序號",
5+
"state": "票券狀態",
6+
"checkin_code": "檢查碼",
7+
"qrcode": "QR Code 序號",
8+
"is_paid": "付款狀態",
9+
"price": "票面價格",
10+
"payment_method": "付款方式",
11+
"updated_at": "付款時間",
12+
"ticket_type": "選用的取票方式",
13+
"order_no": "訂單編號"
14+
}

‎cli/2025/reserved_data_field_names.txt‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Nickname / 暱稱
2+
Gender / 生理性別
3+
Size of T-shirt / 衣服尺寸 (For tickets with t-shirt should fill in this field / 票種有含紀念衣服需填寫)
4+
Dietary Preference / 飲食偏好
5+
來自國家、地區或縣市
6+
Age Range / 年齡區間
7+
Job Title / 職稱 (If you are a student, fill in "student" / 如果您是「學生」，請填寫「student」)
8+
Company / 服務單位 (For students or teachers, fill in the School + Department Name / 學校單位請填寫學校及系所名稱)
9+
Years of Using Python / 使用 Python 多久
10+
Area of Interest / 興趣領域
11+
(Attend first time) How did you know PyCon TW 2025? / (初次參與) 如何得知 PyCon TW？
12+
Have you ever attended PyCon TW? / 您是否曾參加 PyCon TW？
13+
I would like to donate invoice to Open Culture Foundation / 我願意捐贈發票給開放文化基金會 (Ref: https://reurl.cc/ZQ6VY6)
14+
I’ve already read and I accept the Privacy Policy of PyCon TW 2025 / 我已閱讀並同意 PyCon TW 2025 個人資料保護聲明
15+
I'm willing to comply with the PyCon TW 2025 CoC / 我願意遵守 PyCon TW 2025 行為準則
16+
我願意收到未來 PyCon TW 贊助機會相關信件
17+
願意收到未來 PyCon TW 活動訊息
18+
聯絡人 姓名
19+
聯絡人 Email
20+
聯絡人 手機

‎cli/default_data_field_names.txt‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
Nickname / 暱稱
2+
Gender / 生理性別
3+
Size of T-shirt / 衣服尺寸 (For tickets with t-shirt should fill in this field / 票種有含紀念衣服需填寫)
4+
Dietary Preference / 飲食偏好
5+
Come From / 國家或地區
6+
Age Range / 年齡區間
7+
Job Title / 職稱 (If you are a student, fill in "student" / 如果您是「學生」，請填寫「student」)
8+
Company / 服務單位 (For students or teachers, fill in the School + Department Name / 學校單位請填寫學校及系所名稱)
9+
Years of Using Python / 使用 Python 多久
10+
Area of Interest / 興趣領域
11+
(Attend first time) How did you know PyCon TW 2023? / (初次參與) 如何得知 PyCon TW 2023？
12+
Have you ever attended PyCon TW? / 您是否曾參加 PyCon TW？
13+
Have you ever been a PyCon TW volunteer? / 是否曾擔任過 PyCon TW 志工？
14+
(For Submitter) How did you know the CfP information of PyCon Taiwan? / (投稿者) 你是怎麼得知 PyCon Taiwan 徵稿資訊？(If you are NOT submitter, fill in "non-submitter" / 如果您沒有投稿，請填寫「非投稿者」)
15+
Would you like to receive an email from sponsors? / 是否願意收到贊助商轉發的電子郵件？
16+
I would like to donate invoice to Open Culture Foundation / 我願意捐贈發票給開放文化基金會 (Ref: https://reurl.cc/ZQ6VY6)
17+
I’ve already read and I accept the Privacy Policy of PyCon TW 2023 / 我已閱讀並同意 PyCon TW 2023 個人資料保護聲明
18+
I'm willing to comply with the PyCon TW 2023 CoC / 我願意遵守 PyCon TW 2023 行為準則
19+
聯絡人 姓名
20+
聯絡人 Email
21+
聯絡人 手機

‎cli/default_meta_field_mapping.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"id": "Id",
3+
"ticket_name": "票種",
4+
"reg_no": "報名序號",
5+
"state": "票券狀態",
6+
"checkin_code": "檢查碼",
7+
"qrcode": "QR Code 序號",
8+
"is_paid": "付款狀態",
9+
"price": "票面價格",
10+
"payment_method": "付款方式",
11+
"updated_at": "付款時間",
12+
"ticket_type": "選用的取票方式",
13+
"order_no": "訂單編號"
14+
}

0 commit comments

Comments
 (0)