From 3d774f47ef2b59dc79895e5318efe3dc5c3acfc6 Mon Sep 17 00:00:00 2001 From: WillChilds-Klein Date: Mon, 20 May 2024 19:09:43 +0000 Subject: [PATCH] Temporarily skip local CRT install on 3.12+, fix job names --- .github/workflows/integrations.yml | 2 ++ tests/ci/integration/run_python_integration.sh | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integrations.yml b/.github/workflows/integrations.yml index 58395ad6479..86da40b561d 100644 --- a/.github/workflows/integrations.yml +++ b/.github/workflows/integrations.yml @@ -110,6 +110,7 @@ jobs: - "0" - "1" runs-on: ubuntu-latest + name: Python main (FIPS=${{ matrix.fips}} OPENSSL_IN_CRT=${{ matrix.openssl_in_crt }}) steps: - name: Install OS Dependencies run: | @@ -134,6 +135,7 @@ jobs: - "0" - "1" runs-on: ubuntu-latest + name: Python releases (FIPS=${{ matrix.fips}} OPENSSL_IN_CRT=${{ matrix.openssl_in_crt }}) steps: - name: Install OS Dependencies run: | diff --git a/tests/ci/integration/run_python_integration.sh b/tests/ci/integration/run_python_integration.sh index 4fe962483ab..410aa457666 100755 --- a/tests/ci/integration/run_python_integration.sh +++ b/tests/ci/integration/run_python_integration.sh @@ -93,10 +93,16 @@ function fetch_crt_python() { } function install_crt_python() { + python -c 'import ssl; print(ssl.OPENSSL_VERSION)' | grep "AWS-LC" + if ! python -c 'import sys; assert sys.version_info.minor < 12, f"{sys.version_info}"'; then + return + fi # setupttols not installed by default on more recent python versions # see https://github.com/python/cpython/issues/95299 + python -m ensurepip python -m pip install setuptools wheel - python -m pip install -e ${CRT_SRC_FOLDER} + python -m pip list + python -m pip install -e ${CRT_SRC_FOLDER} || bash -i # below was adapted from aws-crt-python's CI # https://github.com/awslabs/aws-crt-python/blob/d76c3dacc94c1aa7dfc7346a77be78dc990b5171/.github/workflows/ci.yml#L159 local awscrt_path=$(python -c "import _awscrt; print(_awscrt.__file__)")