From 2041519d3864d16ec7228c23767d5711115ae1e3 Mon Sep 17 00:00:00 2001 From: Martin Durant Date: Thu, 5 Dec 2024 16:21:29 -0500 Subject: [PATCH 1/3] update s3 ci env --- ci/environment-friends.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/environment-friends.yml b/ci/environment-friends.yml index 114c85444..54c80d4f7 100644 --- a/ci/environment-friends.yml +++ b/ci/environment-friends.yml @@ -25,5 +25,5 @@ dependencies: - google-api-python-client - httpretty - aiobotocore - - "moto >=4,<5" + - moto - flask From f82cc91ca18096f47a6f24382035404bd4a5fc20 Mon Sep 17 00:00:00 2001 From: Martin Durant Date: Thu, 5 Dec 2024 16:25:11 -0500 Subject: [PATCH 2/3] more relaxed --- .github/workflows/main.yaml | 1 + ci/environment-friends.yml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index f9e5ed98c..23dc746bf 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -156,6 +156,7 @@ jobs: run: | pip install -e . --no-deps pip install -e ./${{ matrix.FRIEND }} --no-deps + pip list - name: Test shell: bash -l {0} diff --git a/ci/environment-friends.yml b/ci/environment-friends.yml index 54c80d4f7..9be6a47a0 100644 --- a/ci/environment-friends.yml +++ b/ci/environment-friends.yml @@ -9,7 +9,6 @@ dependencies: - pytest-cov - pytest-mock - pip - - pytest<8 - ujson - requests - decorator From d6e6504d315d7bf4f2dae82663d12cc784079710 Mon Sep 17 00:00:00 2001 From: Martin Durant Date: Thu, 5 Dec 2024 16:27:08 -0500 Subject: [PATCH 3/3] force ssl --- ci/environment-friends.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/environment-friends.yml b/ci/environment-friends.yml index 9be6a47a0..6e6b79a14 100644 --- a/ci/environment-friends.yml +++ b/ci/environment-friends.yml @@ -26,3 +26,4 @@ dependencies: - aiobotocore - moto - flask + - pyopenssl>=24.0.0