-
-
Notifications
You must be signed in to change notification settings - Fork 30.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '3.9' into backport-77e0919-3.9
- Loading branch information
Showing
42 changed files
with
572 additions
and
107 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,7 +25,7 @@ jobs: | |
run_tests: ${{ steps.check.outputs.run_tests }} | ||
run_ssl_tests: ${{ steps.check.outputs.run_ssl_tests }} | ||
steps: | ||
- uses: actions/checkout@v3 | ||
- uses: actions/checkout@v4 | ||
- name: Check for source changes | ||
id: check | ||
run: | | ||
|
@@ -57,8 +57,8 @@ jobs: | |
needs: check_source | ||
if: needs.check_source.outputs.run_tests == 'true' | ||
steps: | ||
- uses: actions/checkout@v2 | ||
- uses: actions/setup-python@v2 | ||
- uses: actions/checkout@v4 | ||
- uses: actions/setup-python@v4 | ||
- name: Install Dependencies | ||
run: | | ||
sudo ./.github/workflows/posix-deps-apt.sh | ||
|
@@ -79,8 +79,8 @@ jobs: | |
needs: check_source | ||
if: needs.check_source.outputs.run_tests == 'true' | ||
steps: | ||
- uses: actions/checkout@v3 | ||
- uses: actions/setup-python@v3 | ||
- uses: actions/checkout@v4 | ||
- uses: actions/setup-python@v4 | ||
- name: Install Dependencies | ||
run: sudo ./.github/workflows/posix-deps-apt.sh | ||
- name: Add ccache to PATH | ||
|
@@ -93,8 +93,12 @@ jobs: | |
grep "aclocal 1.16.3" aclocal.m4 | ||
grep -q "runstatedir" configure | ||
grep -q "PKG_PROG_PKG_CONFIG" aclocal.m4 | ||
- name: Configure CPython | ||
run: | | ||
# Build Python with the libpython dynamic library | ||
./configure --config-cache --with-pydebug --enable-shared | ||
- name: Regenerate autoconf files | ||
run: docker run --rm -v $(pwd):/src quay.io/tiran/cpython_autoconf:269 | ||
run: make regen-configure | ||
- name: Build CPython | ||
run: | | ||
./configure --with-pydebug | ||
|
@@ -119,7 +123,7 @@ jobs: | |
needs: check_source | ||
if: needs.check_source.outputs.run_tests == 'true' | ||
steps: | ||
- uses: actions/checkout@v3 | ||
- uses: actions/checkout@v4 | ||
- name: Build CPython | ||
run: .\PCbuild\build.bat -e -p Win32 | ||
- name: Display build info | ||
|
@@ -133,7 +137,7 @@ jobs: | |
needs: check_source | ||
if: needs.check_source.outputs.run_tests == 'true' | ||
steps: | ||
- uses: actions/checkout@v3 | ||
- uses: actions/checkout@v4 | ||
- name: Build CPython | ||
run: .\PCbuild\build.bat -e -p x64 | ||
- name: Display build info | ||
|
@@ -152,7 +156,7 @@ jobs: | |
HOMEBREW_NO_INSTALL_CLEANUP: 1 | ||
PYTHONSTRICTEXTENSIONBUILD: 1 | ||
steps: | ||
- uses: actions/checkout@v3 | ||
- uses: actions/checkout@v4 | ||
- name: Install Homebrew dependencies | ||
run: brew install pkg-config [email protected] xz gdbm tcl-tk | ||
- name: Configure CPython | ||
|
@@ -178,10 +182,10 @@ jobs: | |
needs: check_source | ||
if: needs.check_source.outputs.run_tests == 'true' | ||
env: | ||
OPENSSL_VER: 1.1.1v | ||
OPENSSL_VER: 3.0.11 | ||
PYTHONSTRICTEXTENSIONBUILD: 1 | ||
steps: | ||
- uses: actions/checkout@v3 | ||
- uses: actions/checkout@v4 | ||
- name: Install Dependencies | ||
run: sudo ./.github/workflows/posix-deps-apt.sh | ||
- name: Configure OpenSSL env vars | ||
|
@@ -220,14 +224,14 @@ jobs: | |
strategy: | ||
fail-fast: false | ||
matrix: | ||
openssl_ver: [1.0.2u, 1.1.0l, 1.1.1v, 3.0.10, 3.1.2] | ||
openssl_ver: [1.0.2u, 1.1.0l, 1.1.1w, 3.0.11, 3.1.3] | ||
env: | ||
OPENSSL_VER: ${{ matrix.openssl_ver }} | ||
MULTISSL_DIR: ${{ github.workspace }}/multissl | ||
OPENSSL_DIR: ${{ github.workspace }}/multissl/openssl/${{ matrix.openssl_ver }} | ||
LD_LIBRARY_PATH: ${{ github.workspace }}/multissl/openssl/${{ matrix.openssl_ver }}/lib | ||
steps: | ||
- uses: actions/checkout@v3 | ||
- uses: actions/checkout@v4 | ||
- name: Install Dependencies | ||
run: sudo ./.github/workflows/posix-deps-apt.sh | ||
- name: Configure OpenSSL env vars | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
# This is a dummy config file so that readthedocs.org doesn't fail on security branches. | ||
# Note that this won't result in docs actually getting built; | ||
# clicking on the docs preview link on a PR will result in a 404. | ||
version: 2 | ||
formats: [] | ||
build: | ||
os: "ubuntu-22.04" | ||
tools: | ||
python: "3.11" | ||
jobs: | ||
post_checkout: | ||
- exit 183 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
# We have upper bounds on our transitive dependencies here | ||
# To avoid new releases unexpectedly breaking our build. | ||
# This file can be updated on an ad-hoc basis, | ||
# though it will probably have to be updated | ||
# whenever Doc/requirements.txt is updated. | ||
|
||
# Direct dependencies of Sphinx | ||
babel<3 | ||
colorama<0.5 | ||
imagesize<1.5 | ||
Jinja2<3.2 | ||
packaging<24 | ||
Pygments>=2.16.1,<3 | ||
requests<3 | ||
snowballstemmer<3 | ||
sphinxcontrib-applehelp<1.0.5 | ||
sphinxcontrib-devhelp<1.0.6 | ||
sphinxcontrib-htmlhelp<2.0.5 | ||
sphinxcontrib-jsmath<1.1 | ||
sphinxcontrib-qthelp<1.0.7 | ||
sphinxcontrib-serializinghtml<1.1.10 | ||
|
||
# Direct dependencies of Jinja2 (Jinja is a dependency of Sphinx, see above) | ||
MarkupSafe<2.2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.