From 91a55ac570568515024873c9814cebc96a2b32b3 Mon Sep 17 00:00:00 2001 From: lkstrp <62255395+lkstrp@users.noreply.github.com> Date: Fri, 10 Jan 2025 12:15:53 +0000 Subject: [PATCH 1/3] Update pinned environment files for all platforms --- envs/linux-pinned.yaml | 38 +++++++++++++++++++------------------- envs/macos-pinned.yaml | 40 ++++++++++++++++++++-------------------- envs/windows-pinned.yaml | 36 ++++++++++++++++++------------------ 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/envs/linux-pinned.yaml b/envs/linux-pinned.yaml index c2c6f7cf6..0a066d8a5 100644 --- a/envs/linux-pinned.yaml +++ b/envs/linux-pinned.yaml @@ -56,7 +56,7 @@ dependencies: - cffi=1.17.1 - cfgv=3.3.1 - cftime=1.6.4 - - charset-normalizer=3.4.0 + - charset-normalizer=3.4.1 - click=8.1.8 - click-plugins=1.1.1 - cligj=0.7.2 @@ -80,7 +80,7 @@ dependencies: - dask=2024.12.1 - dask-core=2024.12.1 - dask-expr=1.1.21 - - datapi=0.1.1 + - datapi=0.1.2 - datrie=0.8.2 - dav1d=1.2.1 - dbus=1.13.6 @@ -99,7 +99,7 @@ dependencies: - expat=2.6.4 - filelock=3.16.1 - fiona=1.10.1 - - folium=0.19.3 + - folium=0.19.4 - font-ttf-dejavu-sans-mono=2.37 - font-ttf-inconsolata=3.000 - font-ttf-source-code-pro=2.038 @@ -124,7 +124,7 @@ dependencies: - gflags=2.2.2 - giflib=5.2.2 - gitdb=4.0.12 - - gitpython=3.1.43 + - gitpython=3.1.44 - glog=0.7.1 - glpk=5.0 - gmp=6.3.0 @@ -140,11 +140,11 @@ dependencies: - humanfriendly=10.0 - hyperframe=6.0.1 - icu=75.1 - - identify=2.6.4 + - identify=2.6.5 - idna=3.10 - immutables=0.21 - importlib-metadata=8.5.0 - - importlib_resources=6.4.5 + - importlib_resources=6.5.2 - iniconfig=2.0.0 - ipopt=3.14.16 - ipython=8.31.0 @@ -183,7 +183,7 @@ dependencies: - libde265=1.0.15 - libdeflate=1.23 - libdrm=2.4.124 - - libedit=3.1.20191231 + - libedit=3.1.20240808 - libegl=1.7.0 - libev=4.33 - libevent=2.1.12 @@ -222,7 +222,7 @@ dependencies: - libopengl=1.7.0 - libparquet=18.1.0 - libpciaccess=0.18 - - libpng=1.6.44 + - libpng=1.6.45 - libpq=17.2 - libprotobuf=5.28.3 - libre2-11=2024.07.02 @@ -284,14 +284,14 @@ dependencies: - orc=2.0.3 - packaging=24.2 - pandas=2.2.3 - - pango=1.54.0 + - pango=1.56.0 - parso=0.8.4 - partd=1.4.2 - patsy=1.0.1 - pcre2=10.44 - pexpect=4.9.0 - pickleshare=0.7.5 - - pillow=11.0.0 + - pillow=11.1.0 - pip=24.3.1 - pixman=0.44.2 - pkgutil-resolve-name=1.3.10 @@ -314,7 +314,7 @@ dependencies: - pyarrow-core=18.1.0 - pycountry=24.6.1 - pycparser=2.22 - - pygments=2.18.0 + - pygments=2.19.1 - pyogrio=0.10.0 - pyparsing=3.2.1 - pyproj=3.7.0 @@ -323,7 +323,7 @@ dependencies: - pyshp=2.3.1 - pyside6=6.8.1 - pysocks=1.7.1 - - pytables=3.10.1 + - pytables=3.10.2 - pytest=8.3.4 - python=3.12.8 - python-dateutil=2.9.0.post0 @@ -345,14 +345,14 @@ dependencies: - reretry=0.11.8 - rioxarray=0.17.0 - rpds-py=0.22.3 - - ruff=0.8.5 + - ruff=0.9.0 - s2n=1.5.10 - - scikit-learn=1.6.0 + - scikit-learn=1.6.1 - scip=9.1.1 - - scipy=1.14.1 + - scipy=1.15.0 - seaborn=0.13.2 - seaborn-base=0.13.2 - - setuptools=75.6.0 + - setuptools=75.7.0 - shapely=2.0.6 - six=1.17.0 - smart_open=7.1.0 @@ -390,13 +390,13 @@ dependencies: - uriparser=0.9.8 - urllib3=2.3.0 - validators=0.34.0 - - virtualenv=20.28.0 + - virtualenv=20.28.1 - wayland=1.23.1 - wcwidth=0.2.13 - wheel=0.45.1 - wrapt=1.17.0 - x265=3.5 - - xarray=2024.11.0 + - xarray=2025.1.1 - xcb-util=0.4.1 - xcb-util-cursor=0.1.5 - xcb-util-image=0.4.0 @@ -441,7 +441,7 @@ dependencies: - pyomo==6.8.2 - requests-oauthlib==1.3.1 - snakemake-executor-plugin-cluster-generic==1.0.9 - - snakemake-executor-plugin-slurm==0.11.2 + - snakemake-executor-plugin-slurm==0.12.0 - snakemake-executor-plugin-slurm-jobstep==0.2.1 - snakemake-storage-plugin-http==0.2.3 - tsam==2.3.6 diff --git a/envs/macos-pinned.yaml b/envs/macos-pinned.yaml index 33a790df3..14a22a757 100644 --- a/envs/macos-pinned.yaml +++ b/envs/macos-pinned.yaml @@ -53,7 +53,7 @@ dependencies: - cffi=1.17.1 - cfgv=3.3.1 - cftime=1.6.4 - - charset-normalizer=3.4.0 + - charset-normalizer=3.4.1 - click=8.1.8 - click-plugins=1.1.1 - cligj=0.7.2 @@ -76,7 +76,7 @@ dependencies: - dask=2024.12.1 - dask-core=2024.12.1 - dask-expr=1.1.21 - - datapi=0.1.1 + - datapi=0.1.2 - datrie=0.8.2 - dav1d=1.2.1 - decorator=5.1.1 @@ -92,7 +92,7 @@ dependencies: - executing=2.1.0 - filelock=3.16.1 - fiona=1.10.1 - - folium=0.19.3 + - folium=0.19.4 - font-ttf-dejavu-sans-mono=2.37 - font-ttf-inconsolata=3.000 - font-ttf-source-code-pro=2.038 @@ -117,7 +117,7 @@ dependencies: - gflags=2.2.2 - giflib=5.2.2 - gitdb=4.0.12 - - gitpython=3.1.43 + - gitpython=3.1.44 - glog=0.7.1 - glpk=5.0 - gmp=6.3.0 @@ -133,11 +133,11 @@ dependencies: - humanfriendly=10.0 - hyperframe=6.0.1 - icu=75.1 - - identify=2.6.4 + - identify=2.6.5 - idna=3.10 - immutables=0.21 - importlib-metadata=8.5.0 - - importlib_resources=6.4.5 + - importlib_resources=6.5.2 - iniconfig=2.0.0 - ipopt=3.14.16 - ipython=8.31.0 @@ -171,7 +171,7 @@ dependencies: - libcxx=19.1.6 - libde265=1.0.15 - libdeflate=1.23 - - libedit=3.1.20191231 + - libedit=3.1.20240808 - libev=4.33 - libevent=2.1.12 - libexpat=2.6.4 @@ -197,12 +197,12 @@ dependencies: - libnghttp2=1.64.0 - libopenblas=0.3.28 - libparquet=18.1.0 - - libpng=1.6.44 + - libpng=1.6.45 - libprotobuf=5.28.3 - libre2-11=2024.07.02 - librsvg=2.58.4 - librttopo=1.1.0 - - libscotch=7.0.5 + - libscotch=7.0.6 - libspatialite=5.1.0 - libsqlite=3.47.2 - libssh2=1.11.1 @@ -249,14 +249,14 @@ dependencies: - orc=2.0.3 - packaging=24.2 - pandas=2.2.3 - - pango=1.54.0 + - pango=1.56.0 - parso=0.8.4 - partd=1.4.2 - patsy=1.0.1 - pcre2=10.44 - pexpect=4.9.0 - pickleshare=0.7.5 - - pillow=11.0.0 + - pillow=11.1.0 - pip=24.3.1 - pixman=0.44.2 - pkgutil-resolve-name=1.3.10 @@ -279,7 +279,7 @@ dependencies: - pyarrow-core=18.1.0 - pycountry=24.6.1 - pycparser=2.22 - - pygments=2.18.0 + - pygments=2.19.1 - pyogrio=0.10.0 - pyparsing=3.2.1 - pyproj=3.7.0 @@ -287,7 +287,7 @@ dependencies: - pyscipopt=5.2.1 - pyshp=2.3.1 - pysocks=1.7.1 - - pytables=3.10.1 + - pytables=3.10.2 - pytest=8.3.4 - python=3.12.8 - python-dateutil=2.9.0.post0 @@ -308,13 +308,13 @@ dependencies: - reretry=0.11.8 - rioxarray=0.17.0 - rpds-py=0.22.3 - - ruff=0.8.5 - - scikit-learn=1.6.0 + - ruff=0.9.0 + - scikit-learn=1.6.1 - scip=9.1.1 - - scipy=1.14.1 + - scipy=1.15.0 - seaborn=0.13.2 - seaborn-base=0.13.2 - - setuptools=75.6.0 + - setuptools=75.7.0 - shapely=2.0.6 - six=1.17.0 - smart_open=7.1.0 @@ -352,12 +352,12 @@ dependencies: - uriparser=0.9.8 - urllib3=2.3.0 - validators=0.34.0 - - virtualenv=20.28.0 + - virtualenv=20.28.1 - wcwidth=0.2.13 - wheel=0.45.1 - wrapt=1.17.0 - x265=3.5 - - xarray=2024.11.0 + - xarray=2025.1.1 - xerces-c=3.2.5 - xlrd=2.0.1 - xorg-libxau=1.0.12 @@ -379,7 +379,7 @@ dependencies: - pyomo==6.8.2 - requests-oauthlib==1.3.1 - snakemake-executor-plugin-cluster-generic==1.0.9 - - snakemake-executor-plugin-slurm==0.11.2 + - snakemake-executor-plugin-slurm==0.12.0 - snakemake-executor-plugin-slurm-jobstep==0.2.1 - snakemake-storage-plugin-http==0.2.3 - tsam==2.3.6 diff --git a/envs/windows-pinned.yaml b/envs/windows-pinned.yaml index 436c6deb9..b5a1126e8 100644 --- a/envs/windows-pinned.yaml +++ b/envs/windows-pinned.yaml @@ -48,7 +48,7 @@ dependencies: - cffi=1.17.1 - cfgv=3.3.1 - cftime=1.6.4 - - charset-normalizer=3.4.0 + - charset-normalizer=3.4.1 - click=8.1.8 - click-plugins=1.1.1 - cligj=0.7.2 @@ -66,7 +66,7 @@ dependencies: - dask=2024.12.1 - dask-core=2024.12.1 - dask-expr=1.1.21 - - datapi=0.1.1 + - datapi=0.1.2 - datrie=0.8.2 - dav1d=1.2.1 - decorator=5.1.1 @@ -83,7 +83,7 @@ dependencies: - executing=2.1.0 - filelock=3.16.1 - fiona=1.10.1 - - folium=0.19.3 + - folium=0.19.4 - font-ttf-dejavu-sans-mono=2.37 - font-ttf-inconsolata=3.000 - font-ttf-source-code-pro=2.038 @@ -106,7 +106,7 @@ dependencies: - geotiff=1.7.3 - getopt-win32=0.1 - gitdb=4.0.12 - - gitpython=3.1.43 + - gitpython=3.1.44 - glpk=5.0 - gmp=6.3.0 - graphite2=1.3.13 @@ -120,11 +120,11 @@ dependencies: - humanfriendly=10.0 - hyperframe=6.0.1 - icu=75.1 - - identify=2.6.4 + - identify=2.6.5 - idna=3.10 - immutables=0.21 - importlib-metadata=8.5.0 - - importlib_resources=6.4.5 + - importlib_resources=6.5.2 - iniconfig=2.0.0 - ipopt=3.14.16 - ipython=8.31.0 @@ -181,7 +181,7 @@ dependencies: - libnetcdf=4.9.2 - libopenblas=0.3.28 - libparquet=18.1.0 - - libpng=1.6.44 + - libpng=1.6.45 - libprotobuf=5.28.3 - libre2-11=2024.07.02 - librttopo=1.1.0 @@ -231,13 +231,13 @@ dependencies: - orc=2.0.3 - packaging=24.2 - pandas=2.2.3 - - pango=1.54.0 + - pango=1.56.0 - parso=0.8.4 - partd=1.4.2 - patsy=1.0.1 - pcre2=10.44 - pickleshare=0.7.5 - - pillow=11.0.0 + - pillow=11.1.0 - pip=24.3.1 - pixman=0.44.2 - pkgutil-resolve-name=1.3.10 @@ -258,7 +258,7 @@ dependencies: - pyarrow-core=18.1.0 - pycountry=24.6.1 - pycparser=2.22 - - pygments=2.18.0 + - pygments=2.19.1 - pyogrio=0.10.0 - pyparsing=3.2.1 - pyproj=3.7.0 @@ -268,7 +268,7 @@ dependencies: - pyshp=2.3.1 - pyside6=6.8.1 - pysocks=1.7.1 - - pytables=3.10.1 + - pytables=3.10.2 - pytest=8.3.4 - python=3.12.8 - python-dateutil=2.9.0.post0 @@ -290,13 +290,13 @@ dependencies: - reretry=0.11.8 - rioxarray=0.17.0 - rpds-py=0.22.3 - - ruff=0.8.5 - - scikit-learn=1.6.0 + - ruff=0.9.0 + - scikit-learn=1.6.1 - scip=9.1.1 - - scipy=1.14.1 + - scipy=1.15.0 - seaborn=0.13.2 - seaborn-base=0.13.2 - - setuptools=75.6.0 + - setuptools=75.7.0 - shapely=2.0.6 - six=1.17.0 - smart_open=7.1.0 @@ -337,14 +337,14 @@ dependencies: - validators=0.34.0 - vc=14.3 - vc14_runtime=14.42.34433 - - virtualenv=20.28.0 + - virtualenv=20.28.1 - vs2015_runtime=14.42.34433 - wcwidth=0.2.13 - wheel=0.45.1 - win_inet_pton=1.1.0 - wrapt=1.17.0 - x265=3.5 - - xarray=2024.11.0 + - xarray=2025.1.1 - xerces-c=3.2.5 - xlrd=2.0.1 - xorg-libice=1.1.2 @@ -373,7 +373,7 @@ dependencies: - pyomo==6.8.2 - requests-oauthlib==1.3.1 - snakemake-executor-plugin-cluster-generic==1.0.9 - - snakemake-executor-plugin-slurm==0.11.2 + - snakemake-executor-plugin-slurm==0.12.0 - snakemake-executor-plugin-slurm-jobstep==0.2.1 - snakemake-storage-plugin-http==0.2.3 - tsam==2.3.6 From 390e8f05de2217efb4597fa2eb25c2db4d592fed Mon Sep 17 00:00:00 2001 From: lkstrp Date: Fri, 10 Jan 2025 13:21:58 +0100 Subject: [PATCH 2/3] run tests on pinned update --- .github/workflows/test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index ba1e5fa0b..e18a707b7 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -4,6 +4,7 @@ on: push: branches: - master + - update-pinned-environment pull_request: branches: - master From 7ad36f924a8837618723e69ea92654ae15d73c49 Mon Sep 17 00:00:00 2001 From: lkstrp Date: Fri, 10 Jan 2025 14:16:08 +0100 Subject: [PATCH 3/3] fix tests --- .github/workflows/test.yaml | 2 +- envs/macos-pinned.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e18a707b7..6c06ee118 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -4,13 +4,13 @@ on: push: branches: - master - - update-pinned-environment pull_request: branches: - master schedule: - cron: "0 5 * * 1-6" - cron: "0 5 * * 0" + workflow_dispatch: # Cancel any in-progress runs when a new run is triggered concurrency: diff --git a/envs/macos-pinned.yaml b/envs/macos-pinned.yaml index 14a22a757..ee9b3198b 100644 --- a/envs/macos-pinned.yaml +++ b/envs/macos-pinned.yaml @@ -311,7 +311,7 @@ dependencies: - ruff=0.9.0 - scikit-learn=1.6.1 - scip=9.1.1 - - scipy=1.15.0 + - scipy=1.14.1 - seaborn=0.13.2 - seaborn-base=0.13.2 - setuptools=75.7.0