From 3da5f6d8bff27469b4ddb5c1b6819f43dad1911d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20David=20M=C3=BCller?= <57191390+t0mdavid-m@users.noreply.github.com> Date: Thu, 8 May 2025 11:25:00 +0200 Subject: [PATCH 1/5] update pyopenms version numbers --- docs/source/_static/switcher.json | 7 ++++++- docs/source/conf.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/source/_static/switcher.json b/docs/source/_static/switcher.json index 9dc098d88..bf22de9f6 100644 --- a/docs/source/_static/switcher.json +++ b/docs/source/_static/switcher.json @@ -1,9 +1,14 @@ [ { "name": "nightly", - "version": "3.4.0dev", + "version": "3.5.0dev", "url": "https://pyopenms.readthedocs.io/en/latest/" }, + { + "name": "3.4.0", + "version": "3.4.0", + "url": "https://pyopenms.readthedocs.io/en/release-3.4.0/" +}, { "name": "3.3.0", "version": "3.3.0", diff --git a/docs/source/conf.py b/docs/source/conf.py index b3ab856bb..d813c7fa9 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -86,7 +86,7 @@ # built documents. # # The short X.Y version. -version = u'3.3.0' +version = u'3.4.0' # The full version, including alpha/beta/rc tags. release = version rtd_branch = os.environ.get('READTHEDOCS_GIT_IDENTIFIER', '') From 696945abeca244c32420f9f6a71227eeb76e1754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20David=20M=C3=BCller?= <57191390+t0mdavid-m@users.noreply.github.com> Date: Thu, 8 May 2025 11:32:08 +0200 Subject: [PATCH 2/5] fix sphinx dependency --- requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/requirements.txt b/requirements.txt index fc5000fcc..27cb8ad09 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,5 +12,7 @@ pyviz_comms jupyter-server-proxy massql sphinx-hoverxref +# Dependency of Sphinx, the 3.0 release breaks it (currently) +snowballstemmer<3 pyopenms From 6d0e3e3a11b9ea361e77d642f300e63a3f7a1fae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20David=20M=C3=BCller?= <57191390+t0mdavid-m@users.noreply.github.com> Date: Thu, 8 May 2025 11:37:21 +0200 Subject: [PATCH 3/5] use python 311 --- .github/workflows/test-pr-sphinx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-pr-sphinx.yml b/.github/workflows/test-pr-sphinx.yml index e47fa3883..b18676444 100644 --- a/.github/workflows/test-pr-sphinx.yml +++ b/.github/workflows/test-pr-sphinx.yml @@ -21,7 +21,7 @@ jobs: - uses: actions/setup-python@v4 with: - python-version: '3.10' # Version range or exact version of a Python version to use, using SemVer's version range syntax + python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax - name: Installing Dependencies run: pip install -r docs/requirements.txt From 8a09a583d8d76a974ae2f7243e9b9701c3972ea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20David=20M=C3=BCller?= <57191390+t0mdavid-m@users.noreply.github.com> Date: Thu, 8 May 2025 11:46:53 +0200 Subject: [PATCH 4/5] change requirements order --- requirements.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 27cb8ad09..1e58405e8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,5 @@ +# Dependency of Sphinx, the 3.0 release breaks it (currently) +snowballstemmer<3 matplotlib plotly pandas @@ -12,7 +14,6 @@ pyviz_comms jupyter-server-proxy massql sphinx-hoverxref -# Dependency of Sphinx, the 3.0 release breaks it (currently) -snowballstemmer<3 + pyopenms From 0c2e66959ca6dd1f1ade251740e83f02dab2a042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20David=20M=C3=BCller?= <57191390+t0mdavid-m@users.noreply.github.com> Date: Thu, 8 May 2025 11:48:41 +0200 Subject: [PATCH 5/5] change requirements --- docs/requirements.txt | 2 ++ requirements.txt | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 7e5bcba3e..e1a8e5cf8 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -8,6 +8,8 @@ sphinx-remove-toctrees ## for pygment coloring of code snippets using ipython syntax ipython pygments-lexer-pseudocode +# Dependency of Sphinx, the 3.0 release breaks it (currently) +snowballstemmer<3 --extra-index-url https://pypi.cs.uni-tuebingen.de/simple/ pyopenms \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 1e58405e8..76a798e56 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,3 @@ -# Dependency of Sphinx, the 3.0 release breaks it (currently) -snowballstemmer<3 matplotlib plotly pandas