From 43b3397541d6229b26c07dc20716e8c79485324e Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Sat, 25 Mar 2023 10:00:29 -0400 Subject: [PATCH 1/5] Rebuild for cryptography --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ba0e9360..29ccc9f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -103,7 +103,7 @@ jobs: path: | bin.tar.xz src/cpython - key: gam-${{ matrix.jid }}-20230314 + key: gam-${{ matrix.jid }}-20230326 - name: Untar Cache archive if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit == 'true' From a2e06adbbee1e31be22c3f726122f970ef3fd300 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Tue, 28 Mar 2023 08:21:46 -0400 Subject: [PATCH 2/5] pin cryptography to 39.0.2 for time being --- src/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/requirements.txt b/src/requirements.txt index a56a4122..535fe47f 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -1,4 +1,4 @@ -cryptography +cryptography==39.0.2 distro; sys_platform == 'linux' filelock google-api-python-client>=2.1 From b64e4cf3dcf567766e021048b48ba69816d27185 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Tue, 28 Mar 2023 08:43:57 -0400 Subject: [PATCH 3/5] [no ci] that didn't work, we'll try rolling forward... --- src/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/requirements.txt b/src/requirements.txt index 535fe47f..a56a4122 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -1,4 +1,4 @@ -cryptography==39.0.2 +cryptography distro; sys_platform == 'linux' filelock google-api-python-client>=2.1 From c69a86b535578559196348767193b180d34e8808 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Tue, 28 Mar 2023 08:49:03 -0400 Subject: [PATCH 4/5] use constraints.txt to prevent any downgrades during pip install --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 29ccc9f9..e4cb5e4a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -420,7 +420,10 @@ jobs: cryptography "${PYTHON}" -m pip install --force-reinstall --no-deps cryptography*.whl fi - "${PYTHON}" -m pip install --upgrade -r requirements.txt ${PIP_ARGS} + # build constraints file to prevent downgrades of existing + # packages + "${PYTHON}" -m pip freeze | grep == | sed 's/==/>=/' > constraints.txt + "${PYTHON}" -m pip install --upgrade -c constraints.txt -r requirements.txt ${PIP_ARGS} "${PYTHON}" -m pip list - name: Install PyInstaller From 030e2e270faea88e52529fbe0a1b5dcce691e468 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Thu, 30 Mar 2023 10:14:24 -0400 Subject: [PATCH 5/5] Another attempt at fixing cryptography --- .github/workflows/build.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e4cb5e4a..16b08fe4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -410,6 +410,7 @@ jobs: - name: Install pip requirements run: | + "${PYTHON}" -m pip install --upgrade -r requirements.txt ${PIP_ARGS} if [[ "${RUNNER_OS}" == "macOS" ]]; then "${PYTHON}" -m pip install --upgrade cffi ${PIP_ARGS} "${PYTHON}" -m pip download --only-binary :all: \ @@ -419,11 +420,9 @@ jobs: --platform macosx_10_15_universal2 \ cryptography "${PYTHON}" -m pip install --force-reinstall --no-deps cryptography*.whl + else + "${PYTHON}" -m pip install --force-reinstall --no-deps --upgrade cryptography fi - # build constraints file to prevent downgrades of existing - # packages - "${PYTHON}" -m pip freeze | grep == | sed 's/==/>=/' > constraints.txt - "${PYTHON}" -m pip install --upgrade -c constraints.txt -r requirements.txt ${PIP_ARGS} "${PYTHON}" -m pip list - name: Install PyInstaller