From 089014c8eb0fded27264f9adc7ff9ef99343f8cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Jun 2025 03:12:49 +0000 Subject: [PATCH 1/4] Bump urllib3 from 2.2.2 to 2.5.0 in /doc Bumps [urllib3](https://github.com/urllib3/urllib3) from 2.2.2 to 2.5.0. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](https://github.com/urllib3/urllib3/compare/2.2.2...2.5.0) --- updated-dependencies: - dependency-name: urllib3 dependency-version: 2.5.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- doc/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index 540e3f774..7458a060c 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -86,5 +86,5 @@ sphinxcontrib-serializinghtml==1.1.9 # via sphinx tabulate==0.9.0 # via numpydoc -urllib3==2.2.2 +urllib3==2.5.0 # via requests From cc2c5322d719ec58ba8d5d8d19afc9d93709f1f9 Mon Sep 17 00:00:00 2001 From: Fridolin Glatter Date: Fri, 20 Jun 2025 11:15:55 +0200 Subject: [PATCH 2/4] Pin pandas for RTD deps and update other deps --- doc/requirements.in | 3 ++- doc/requirements.txt | 35 ++++++++++++++++++++++------------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/doc/requirements.in b/doc/requirements.in index 07504914e..d7e3b9593 100644 --- a/doc/requirements.in +++ b/doc/requirements.in @@ -3,6 +3,7 @@ gitpython==3.1.44 numpydoc==1.8.0 -sphinx==8.2.1 +pandas==2.2.3 +sphinx==8.2.3 sphinx-rtd-theme==3.0.2 sphinxcontrib-bibtex==2.6.3 diff --git a/doc/requirements.txt b/doc/requirements.txt index 7458a060c..709dcc43e 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,9 +1,5 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --allow-unsafe --output-file=doc/requirements.txt --strip-extras doc/requirements.in -# +# This file was autogenerated by uv via the following command: +# uv pip compile --strip-extras doc/requirements.in -o doc/requirements.txt alabaster==0.7.16 # via sphinx babel==2.16.0 @@ -21,7 +17,7 @@ docutils==0.20.1 gitdb==4.0.10 # via gitpython gitpython==3.1.44 - # via -r requirements.in + # via -r doc/requirements.in idna==3.7 # via requests imagesize==1.4.1 @@ -32,10 +28,14 @@ latexcodec==2.0.1 # via pybtex markupsafe==2.1.3 # via jinja2 +numpy==2.3.0 + # via pandas numpydoc==1.8.0 - # via -r requirements.in + # via -r doc/requirements.in packaging==23.1 # via sphinx +pandas==2.2.3 + # via -r doc/requirements.in pybtex==0.24.0 # via # pybtex-docutils @@ -44,34 +44,41 @@ pybtex-docutils==1.0.2 # via sphinxcontrib-bibtex pygments==2.18.0 # via sphinx +python-dateutil==2.9.0.post0 + # via pandas +pytz==2025.2 + # via pandas pyyaml==6.0.1 # via pybtex -requests==2.32.0 +requests==2.32.4 # via sphinx roman-numerals-py==3.1.0 # via sphinx +setuptools==80.9.0 + # via sphinxcontrib-bibtex six==1.16.0 # via # latexcodec # pybtex + # python-dateutil smmap==5.0.0 # via gitdb snowballstemmer==2.2.0 # via sphinx -sphinx==8.2.1 +sphinx==8.2.3 # via - # -r requirements.in + # -r doc/requirements.in # numpydoc # sphinx-rtd-theme # sphinxcontrib-bibtex # sphinxcontrib-jquery # sphinxcontrib-serializinghtml sphinx-rtd-theme==3.0.2 - # via -r requirements.in + # via -r doc/requirements.in sphinxcontrib-applehelp==2.0.0 # via sphinx sphinxcontrib-bibtex==2.6.3 - # via -r requirements.in + # via -r doc/requirements.in sphinxcontrib-devhelp==2.0.0 # via sphinx sphinxcontrib-htmlhelp==2.1.0 @@ -86,5 +93,7 @@ sphinxcontrib-serializinghtml==1.1.9 # via sphinx tabulate==0.9.0 # via numpydoc +tzdata==2025.2 + # via pandas urllib3==2.5.0 # via requests From 97c318c7b594316643bdbac3d115d87c2cf705c7 Mon Sep 17 00:00:00 2001 From: Fridolin Glatter Date: Fri, 20 Jun 2025 11:41:21 +0200 Subject: [PATCH 3/4] Bump minimum version of GAMS --- .github/workflows/pytest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml index ee30b69d8..b6c0a5bfb 100644 --- a/.github/workflows/pytest.yaml +++ b/.github/workflows/pytest.yaml @@ -21,7 +21,7 @@ defaults: shell: bash env: - GAMS_VERSION: 45.7.0 # Oldest version of gamsapi allowed by pyproject.toml + GAMS_VERSION: 48.6.1 # Oldest version of GAMS that one can download depth: 100 # Must be large enough to include the most recent release label: "safe to test" # Label that must be applied to run on PRs from forks python-version: "3.13" # For non-matrixed jobs From 7dcc9598361ac32b03924894bed7b0cdc7bf6cd2 Mon Sep 17 00:00:00 2001 From: Fridolin Glatter Date: Fri, 20 Jun 2025 13:22:37 +0200 Subject: [PATCH 4/4] Bump GAMS CI version to latest available --- .github/workflows/conda.yaml | 4 ++-- .github/workflows/nightly.yaml | 4 ++-- .github/workflows/pytest.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/conda.yaml b/.github/workflows/conda.yaml index 48a7b1494..edf37701b 100644 --- a/.github/workflows/conda.yaml +++ b/.github/workflows/conda.yaml @@ -11,8 +11,8 @@ on: # branches: [ main ] env: - # First version including a macOS arm64 distribution - GAMS_VERSION: 43.4.1 + # Oldest version that can reliably be downloaded + GAMS_VERSION: 48.6.1 jobs: conda: diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index a77a778b7..376d204c9 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -21,8 +21,8 @@ env: depth: 100 # See description in pytest.yaml # Version used until 2024-11-20; disabled # gams-version: 29.1.0 - # First version including a macOS arm64 distribution - gams-version: 43.4.1 + # Oldest version that can reliably be downloaded + gams-version: 48.6.1 os: ubuntu-latest python-version: "3.13" diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml index b6c0a5bfb..10ce5ae5d 100644 --- a/.github/workflows/pytest.yaml +++ b/.github/workflows/pytest.yaml @@ -21,7 +21,7 @@ defaults: shell: bash env: - GAMS_VERSION: 48.6.1 # Oldest version of GAMS that one can download + GAMS_VERSION: 48.6.1 # Oldest version of GAMS that can reliably be downloaded depth: 100 # Must be large enough to include the most recent release label: "safe to test" # Label that must be applied to run on PRs from forks python-version: "3.13" # For non-matrixed jobs