Skip to content

Commit d0381a8

Browse files
authored
Merge branch '3.13' into pickle
2 parents 10b5c6d + 94e3735 commit d0381a8

File tree

509 files changed

+45717
-38172
lines changed

Some content is hidden

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

509 files changed

+45717
-38172
lines changed

.github/workflows/deploy-gh-page.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: deploy-gh-page
33
on:
44
push:
55
branches:
6-
- "3.12"
6+
- "3.13"
77

88
jobs:
99
cd:
@@ -18,7 +18,7 @@ jobs:
1818
run: make all
1919

2020
- name: Deploy to gh page
21-
uses: JamesIves/github-pages-deploy-action@v4.6.3
21+
uses: JamesIves/github-pages-deploy-action@v4.6.4
2222
with:
2323
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2424
BRANCH: gh-pages

.github/workflows/py312-sync-cpython.yml renamed to .github/workflows/py313-sync-cpython.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
name: python-3.12-sync-with-cpython
1+
name: python-3.13-sync-with-cpython
22

33
on:
44
push:
55
branches:
6-
- "3.12"
6+
- "3.13"
77
schedule:
88
- cron: "0 0 * * *"
99

1010
jobs:
1111
sync:
1212
runs-on: ubuntu-latest
1313
env:
14-
VERSION: "3.12"
15-
BRANCH: "cron/sync/3.12"
14+
VERSION: "3.13"
15+
BRANCH: "cron/sync/3.13"
1616
steps:
1717
- uses: actions/checkout@v4
1818
with:
@@ -50,15 +50,15 @@ jobs:
5050
base: ${{ env.VERSION }}
5151
branch: ${{ env.BRANCH }}
5252
delete-branch: false
53-
title: 'Sync with CPython ${{ env.VERSION }}'
53+
title: "Sync with CPython ${{ env.VERSION }}"
5454
body: |
5555
Sync with CPython ${{ env.VERSION }}
5656
draft: true
5757
labels: |
5858
sync-cpython
5959
automation
60-
60+
6161
- name: Check outputs
6262
run: |
6363
echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
64-
echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
64+
echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"

.gitignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
11
*.mo
22
__pycache__
33
.DS_Store
4+
5+
# Environments
6+
.env
7+
.venv
8+
env/
9+
venv/
10+
ENV/
11+
env.bak/
12+
venv.bak/

.scripts/poetry.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ endef
3838
export PRINT_HELP_PYSCRIPT # End of python section
3939

4040
CPYTHON_CLONE := ../cpython
41-
VERSION := $(or $(VERSION), 3.12)
41+
VERSION := $(or $(VERSION), 3.13)
4242
SPHINX_CONF := $(CPYTHON_CLONE)/Doc/conf.py
4343
LANGUAGE := zh_TW
4444
LC_MESSAGES := $(CPYTHON_CLONE)/Doc/locales/$(LANGUAGE)/LC_MESSAGES

README.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Python 官方說明文件臺灣繁體中文翻譯計畫
66
:target: https://discord.gg/44XheGXhWH
77
:alt: Join Chat on Discord
88

9-
這是 Python 3.12 官方說明文件的臺灣繁體中文(zh_TW)翻譯。
9+
這是 Python 3.13 官方說明文件的臺灣繁體中文(zh_TW)翻譯。
1010

1111
翻譯之前,請務必詳讀並同意\ `授權與 License`_。參與方式請參考\ `參與翻譯`_。
1212

@@ -132,13 +132,13 @@ the PSF for inclusion in the documentation.
132132

133133
接著在 terminal 裡按照以下步驟:
134134

135-
1. 基於最新版本的 ``upstream/3.12`` 開啟一個 branch,現在假設我們想要翻譯 library/math.po \
135+
1. 基於最新版本的 ``upstream/3.13`` 開啟一個 branch,現在假設我們想要翻譯 library/math.po \
136136
所以把這個 branch 叫做 ``library/math``:
137137

138138
.. code-block:: bash
139139
140140
git fetch upstream
141-
git checkout -b library/math upstream/3.12
141+
git checkout -b library/math upstream/3.13
142142
143143
2. 接著就可以開始翻譯(翻譯時可參考\ `翻譯守則`_),你可以手動開啟 Poedit 應用程式再選 \
144144
library/math.po 檔案打開
@@ -222,7 +222,7 @@ the PSF for inclusion in the documentation.
222222

223223
- 從 upstream(我們的主要 GitHub repo)做 fetch 的動作
224224
- 對 origin(你的 fork)做 push
225-
- 永遠不對 ``3.12`` branch 進行修改,請保持讓這個 branch 唯讀,可以避免掉很多問題。
225+
- 永遠不對 ``3.13`` branch 進行修改,請保持讓這個 branch 唯讀,可以避免掉很多問題。
226226

227227
要翻譯哪些東西
228228
--------------

about.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# hsiao yi <hsiaoyi0504@gmail.com>, 2015
1313
msgid ""
1414
msgstr ""
15-
"Project-Id-Version: Python 3.12\n"
15+
"Project-Id-Version: Python 3.13\n"
1616
"Report-Msgid-Bugs-To: \n"
1717
"POT-Creation-Date: 2022-08-05 00:19+0000\n"
1818
"PO-Revision-Date: 2022-05-12 00:11+0800\n"

bugs.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# Steven Hsu <hsuhaochun@gmail.com>, 2021-2022
1212
msgid ""
1313
msgstr ""
14-
"Project-Id-Version: Python 3.12\n"
14+
"Project-Id-Version: Python 3.13\n"
1515
"Report-Msgid-Bugs-To: \n"
1616
"POT-Creation-Date: 2024-04-18 19:45+0000\n"
1717
"PO-Revision-Date: 2022-08-31 12:34+0800\n"

c-api/abstract.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#
99
msgid ""
1010
msgstr ""
11-
"Project-Id-Version: Python 3.12\n"
11+
"Project-Id-Version: Python 3.13\n"
1212
"Report-Msgid-Bugs-To: \n"
1313
"POT-Creation-Date: 2018-06-26 18:54+0800\n"
1414
"PO-Revision-Date: 2021-12-09 21:20+0800\n"

c-api/allocation.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#
99
msgid ""
1010
msgstr ""
11-
"Project-Id-Version: Python 3.12\n"
11+
"Project-Id-Version: Python 3.13\n"
1212
"Report-Msgid-Bugs-To: \n"
1313
"POT-Creation-Date: 2023-08-09 00:03+0000\n"
1414
"PO-Revision-Date: 2022-10-16 15:35+0800\n"

c-api/apiabiversion.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Matt Wang <mattwang44@gmail.com>, 2022
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Python 3.12\n"
9+
"Project-Id-Version: Python 3.13\n"
1010
"Report-Msgid-Bugs-To: \n"
1111
"POT-Creation-Date: 2023-07-29 00:03+0000\n"
1212
"PO-Revision-Date: 2022-01-24 22:34+0800\n"

0 commit comments

Comments
 (0)