Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 829f7da

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

172 files changed

+5,264-1,821Lines changed: 5264 additions & 1821 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎.github/CODEOWNERS‎

Copy file name to clipboardExpand all lines: .github/CODEOWNERS
+3Lines 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
Collapse file

‎.github/workflows/build.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/build.yml
+3-3Lines 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:
Collapse file

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

Copy file name to clipboardExpand all lines: .github/workflows/reusable-ubuntu.yml
+1-1Lines 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:
Collapse file

‎Android/android.py‎

Copy file name to clipboardExpand all lines: Android/android.py
+1-1Lines 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}")
Collapse file

‎Doc/c-api/bytes.rst‎

Copy file name to clipboardExpand all lines: Doc/c-api/bytes.rst
+1-1Lines changed: 1 addition & 1 deletion
  • Display the source diff
  • Display the rich diff
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)
Collapse file

‎Doc/c-api/init.rst‎

Copy file name to clipboardExpand all lines: Doc/c-api/init.rst
+1-1Lines changed: 1 addition & 1 deletion
  • Display the source diff
  • Display the rich diff
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 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.