From 64f900d4be6b4a9c5e98b88164dcbdfa508cc98a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Sat, 6 Jul 2024 11:30:26 -0600 Subject: [PATCH 1/8] CI: disable cache --- .github/workflows/CI.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index ef534c5c6f..fbfdae14f8 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -26,14 +26,14 @@ jobs: with: fetch-depth: 0 - - name: Cache conda - uses: actions/cache@v3 - env: - CACHE_NUMBER: 0 - with: - path: ~/conda_pkgs_dir - key: - ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('ci/environment.yml') }} +# - name: Cache conda +# uses: actions/cache@v3 +# env: +# CACHE_NUMBER: 0 +# with: +# path: ~/conda_pkgs_dir +# key: +# ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('ci/environment.yml') }} - uses: conda-incubator/setup-miniconda@v2 with: From 63403175e09b7ff1ca9a1a84e067a1a8e557a250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Sat, 6 Jul 2024 12:19:10 -0600 Subject: [PATCH 2/8] Fix package versions --- ci/environment.yml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/ci/environment.yml b/ci/environment.yml index b9b7fd715f..af0c0c36a8 100644 --- a/ci/environment.yml +++ b/ci/environment.yml @@ -4,19 +4,20 @@ channels: - defaults dependencies: - llvmdev=11.1.0 - - toml - - pytest - - jupyter + - toml=0.10.2 + - pytest=7.2.0 + - jupyter=1.0.0 - xeus=1.0.1 - - xtl - - nlohmann_json - - cppzmq - - jupyter_kernel_test - - xonsh - - re2c - - numpy - - zlib - - ninja - - rapidjson + - xtl=0.7.4 + - nlohmann_json=3.9.1 + - cppzmq=4.7.1 + - jupyter_kernel_test=0.4.4 + - xonsh=0.16.0 + - re2c=2.2 + - numpy=1.23.4 + - zlib=1.2.13 + - zstd=1.5.6 + - ninja=1.11.0 + - rapidjson=1.1.0 # - bison=3.4 [not win] # - m2-bison=3.4 [win] From 4813cf00d986b802e86edd0dac2eae056c3970f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Sat, 6 Jul 2024 12:22:25 -0600 Subject: [PATCH 3/8] Upgrade miniconda --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index fbfdae14f8..d1ebd89a95 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -35,7 +35,7 @@ jobs: # key: # ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('ci/environment.yml') }} - - uses: conda-incubator/setup-miniconda@v2 + - uses: conda-incubator/setup-miniconda@v3 with: miniconda-version: "latest" auto-update-conda: true From 4210e610665d293d136c1afb228784fab82c401a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Sat, 6 Jul 2024 14:06:32 -0600 Subject: [PATCH 4/8] Downgrade --- ci/environment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/environment.yml b/ci/environment.yml index af0c0c36a8..df32d15006 100644 --- a/ci/environment.yml +++ b/ci/environment.yml @@ -12,11 +12,11 @@ dependencies: - nlohmann_json=3.9.1 - cppzmq=4.7.1 - jupyter_kernel_test=0.4.4 - - xonsh=0.16.0 + - xonsh=0.13.3 - re2c=2.2 - numpy=1.23.4 - zlib=1.2.13 - - zstd=1.5.6 + - zstd=1.5.2 - ninja=1.11.0 - rapidjson=1.1.0 # - bison=3.4 [not win] From 6428d0ea4baabf62382e1187be1a447601b711dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Sat, 6 Jul 2024 14:07:18 -0600 Subject: [PATCH 5/8] reset --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index d1ebd89a95..fbfdae14f8 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -35,7 +35,7 @@ jobs: # key: # ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('ci/environment.yml') }} - - uses: conda-incubator/setup-miniconda@v3 + - uses: conda-incubator/setup-miniconda@v2 with: miniconda-version: "latest" auto-update-conda: true From 1b3a65144e3a9c709aaad5a51beb5c65bae7684c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Sat, 6 Jul 2024 14:21:38 -0600 Subject: [PATCH 6/8] Force zstd for sympy --- .github/workflows/CI.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index fbfdae14f8..279445eb58 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -405,6 +405,7 @@ jobs: bison=3.4 symengine=0.12.0 sympy=1.11.1 + zstd=1.5.6 - uses: hendrikmuhs/ccache-action@main with: From b6575dadc3c40488397b2a275520cfa4c5eb4e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Sat, 6 Jul 2024 14:23:11 -0600 Subject: [PATCH 7/8] X --- ci/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/environment.yml b/ci/environment.yml index df32d15006..54ccd9de46 100644 --- a/ci/environment.yml +++ b/ci/environment.yml @@ -16,7 +16,7 @@ dependencies: - re2c=2.2 - numpy=1.23.4 - zlib=1.2.13 - - zstd=1.5.2 + - zstd - ninja=1.11.0 - rapidjson=1.1.0 # - bison=3.4 [not win] From f5d75e56997d0a14cbbc59249dc736b651afd0d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Sat, 6 Jul 2024 14:24:32 -0600 Subject: [PATCH 8/8] X --- ci/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/environment.yml b/ci/environment.yml index 54ccd9de46..4fcd733601 100644 --- a/ci/environment.yml +++ b/ci/environment.yml @@ -15,7 +15,7 @@ dependencies: - xonsh=0.13.3 - re2c=2.2 - numpy=1.23.4 - - zlib=1.2.13 + - zlib - zstd - ninja=1.11.0 - rapidjson=1.1.0