Skip to content

Commit 829f7da

Browse files
rruuaanngrruuaanng
authored
Merge branch 'main' into dev3
2 parents 438b1e4 + 93b61bc commit 829f7da

File tree

172 files changed

+5264
-1821
lines changed

Some content is hidden

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

172 files changed

+5264
-1821
lines changed

‎.github/CODEOWNERS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,3 +276,6 @@ Lib/test/test_interpreters/ @ericsnowcurrently
276276
# Config Parser
277277
Lib/configparser.py @jaraco
278278
Lib/test/test_configparser.py @jaraco
279+
280+
# Doc sections
281+
Doc/reference/ @willingc

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ jobs:
202202
strategy:
203203
fail-fast: false
204204
matrix:
205-
openssl_ver: [1.1.1w, 3.0.13, 3.1.5, 3.2.1]
205+
openssl_ver: [3.0.15, 3.1.7, 3.2.3, 3.3.2]
206206
env:
207207
OPENSSL_VER: ${{ matrix.openssl_ver }}
208208
MULTISSL_DIR: ${{ github.workspace }}/multissl
@@ -266,7 +266,7 @@ jobs:
266266
needs: check_source
267267
if: needs.check_source.outputs.run_tests == 'true' && needs.check_source.outputs.run_hypothesis == 'true'
268268
env:
269-
OPENSSL_VER: 3.0.13
269+
OPENSSL_VER: 3.0.15
270270
PYTHONSTRICTEXTENSIONBUILD: 1
271271
steps:
272272
- uses: actions/checkout@v4
@@ -380,7 +380,7 @@ jobs:
380380
needs: check_source
381381
if: needs.check_source.outputs.run_tests == 'true'
382382
env:
383-
OPENSSL_VER: 3.0.13
383+
OPENSSL_VER: 3.0.15
384384
PYTHONSTRICTEXTENSIONBUILD: 1
385385
ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
386386
steps:

‎.github/workflows/reusable-ubuntu.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-22.04
1818
env:
1919
FORCE_COLOR: 1
20-
OPENSSL_VER: 3.0.13
20+
OPENSSL_VER: 3.0.15
2121
PYTHONSTRICTEXTENSIONBUILD: 1
2222
TERM: linux
2323
steps:

‎Android/android.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ def make_build_python(context):
138138

139139
def unpack_deps(host):
140140
deps_url = "https://github.com/beeware/cpython-android-source-deps/releases/download"
141-
for name_ver in ["bzip2-1.0.8-1", "libffi-3.4.4-2", "openssl-3.0.13-1",
141+
for name_ver in ["bzip2-1.0.8-1", "libffi-3.4.4-2", "openssl-3.0.15-0",
142142
"sqlite-3.45.1-0", "xz-5.4.6-0"]:
143143
filename = f"{name_ver}-{host}.tar.gz"
144144
download(f"{deps_url}/{name_ver}/{filename}")

‎Doc/c-api/bytes.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ called with a non-bytes parameter.
204204
On success, return a new :class:`bytes` object.
205205
On error, set an exception and return ``NULL``.
206206
207-
.. versionadded: 3.14
207+
.. versionadded:: 3.14
208208
209209
210210
.. c:function:: int _PyBytes_Resize(PyObject **bytes, Py_ssize_t newsize)

‎Doc/c-api/init.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Initialization, Finalization, and Threads
88
*****************************************
99

10-
See also :ref:`Python Initialization Configuration <init-config>`.
10+
See also the :ref:`Python Initialization Configuration <init-config>`.
1111

1212
.. _pre-init-safe:
1313

0 commit comments

Comments
 (0)