From 57bc8708e8a11dc88c7a304a551b1c64c00161bd Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Mon, 19 Aug 2024 09:44:13 +0200 Subject: [PATCH 1/2] CI: temporarily pin conda s2geometry to 0.10 --- ci/environment.yml | 2 +- docs/environment.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/environment.yml b/ci/environment.yml index dfcf8f9..edae19c 100644 --- a/ci/environment.yml +++ b/ci/environment.yml @@ -3,7 +3,7 @@ channels: - conda-forge dependencies: - cxx-compiler - - s2geometry + - s2geometry=0.10 - s2geography - libabseil - cmake diff --git a/docs/environment.yml b/docs/environment.yml index 3ffc37a..8c648ba 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -8,7 +8,7 @@ dependencies: - cxx-compiler - cmake - make - - s2geometry + - s2geometry=0.10 - libabseil - sphinx - pydata-sphinx-theme>=0.8.1 From 78bd2490869c1a02e20daef70c474ee675465a2e Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Mon, 19 Aug 2024 09:50:08 +0200 Subject: [PATCH 2/2] don't use macos arm for now --- .github/workflows/run-tests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml index 8da7447..5c1ed2b 100644 --- a/.github/workflows/run-tests.yaml +++ b/.github/workflows/run-tests.yaml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - os: ["ubuntu-latest", "macos-latest", "windows-latest"] + os: ["ubuntu-latest", "macos-13", "windows-latest"] python-version: ["3.9", "3.10", "3.11"] dev: [false] env: @@ -27,7 +27,7 @@ jobs: python-version: "3.11" dev: true - env: ci/environment-dev.yml - os: macos-latest + os: macos-13 python-version: "3.11" dev: true - env: ci/environment-dev.yml