From 11b65121018cf4faa5c7ae13589426de04b327b6 Mon Sep 17 00:00:00 2001 From: Tingna Wang Date: Sun, 20 Jul 2025 20:25:37 +0800 Subject: [PATCH 1/3] DOC change order of logos --- doc/index.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/index.rst b/doc/index.rst index fd01887..2de5ee7 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -1,8 +1,8 @@ +-----------------------------------------+-----------------------------------------+-----------------------------------------+-----------------------------------------+ -| .. figure:: images/sheffield-logo.svg | .. figure:: images/tongji-logo.jpg | .. figure:: images/DRG-logo.png | .. figure:: images/shmc.png | -| :target: https://www.sheffield.ac.uk/ | :target: https://www.tongji.edu.cn/ | :target: https://drg.ac.uk/ | :target: https://shmc.tongji.edu.cn/ | +| .. figure:: images/tongji-logo.jpg | .. figure:: images/sheffield-logo.svg | .. figure:: images/shmc.png | .. figure:: images/DRG-logo.png | +| :target: https://www.tongji.edu.cn/ | :target: https://www.sheffield.ac.uk/ | :target: https://shmc.tongji.edu.cn/ | :target: https://drg.ac.uk/ | | :figwidth: 70pt | :figwidth: 70pt | :figwidth: 70pt | :figwidth: 70pt | -| :alt: Sheffield | :alt: Tongji | :alt: DRG | :alt: SHMC | +| :alt: Tongji | :alt: Sheffield | :alt: SHMC | :alt: DRG | | | | | | | | | | | +-----------------------------------------+-----------------------------------------+-----------------------------------------+-----------------------------------------+ From dba3ea98c9cc5bfcd82cd50d1ad9787db36567e1 Mon Sep 17 00:00:00 2001 From: SIKAI ZHANG <34108862+MatthewSZhang@users.noreply.github.com> Date: Mon, 21 Jul 2025 11:45:16 +0800 Subject: [PATCH 2/3] bug furo version --- pixi.lock | 4 ++-- pyproject.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pixi.lock b/pixi.lock index a933333..5f3d7ce 100644 --- a/pixi.lock +++ b/pixi.lock @@ -3610,10 +3610,10 @@ packages: - pypi: ./ name: fastcan version: 0.4.0 - sha256: d77a867eb1089c1057661ebe9f1771dd1b610c1125f23e903ba25a005fede67c + sha256: b2a57cb1af21ec1e3e5711cc57f383050eb7d8dee0a7efea608f09f198cecf51 requires_dist: - scikit-learn>=1.7.0 - - furo ; extra == 'docs' + - furo<2025.0.0 ; extra == 'docs' - matplotlib ; extra == 'docs' - sphinx-gallery ; extra == 'docs' - sphinx-design ; extra == 'docs' diff --git a/pyproject.toml b/pyproject.toml index 41d1f96..2fccc4e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,7 +33,7 @@ download = "https://pypi.org/project/fastcan/#files" tracker = "https://github.com/scikit-learn-contrib/fastcan/issues" [project.optional-dependencies] -docs = ["furo", "matplotlib", "sphinx_gallery", "sphinx-design", "sphinxcontrib-plantuml"] +docs = ["furo<2025.0.0", "matplotlib", "sphinx_gallery", "sphinx-design", "sphinxcontrib-plantuml"] [build-system] requires = ["meson-python>=0.18.0", "Cython>=3.1.0", "scikit-learn>=1.7.0"] From 45d4778e83fe8111faabbb1fd3267f8d06439b10 Mon Sep 17 00:00:00 2001 From: SIKAI ZHANG <34108862+MatthewSZhang@users.noreply.github.com> Date: Mon, 21 Jul 2025 11:59:20 +0800 Subject: [PATCH 3/3] bug sklearn version --- pixi.lock | 6 +++--- pyproject.toml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pixi.lock b/pixi.lock index 5f3d7ce..8fd9ffd 100644 --- a/pixi.lock +++ b/pixi.lock @@ -3610,10 +3610,10 @@ packages: - pypi: ./ name: fastcan version: 0.4.0 - sha256: b2a57cb1af21ec1e3e5711cc57f383050eb7d8dee0a7efea608f09f198cecf51 + sha256: e6147fe3e91398a17e00529fba3e4d5832a4ed117d63d41fa3ad700a44a62665 requires_dist: - - scikit-learn>=1.7.0 - - furo<2025.0.0 ; extra == 'docs' + - scikit-learn>=1.7.0,!=1.7.1 + - furo ; extra == 'docs' - matplotlib ; extra == 'docs' - sphinx-gallery ; extra == 'docs' - sphinx-design ; extra == 'docs' diff --git a/pyproject.toml b/pyproject.toml index 2fccc4e..76930c1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ requires-python = ">=3.10" readme = "README.rst" license = { file = "LICENSE" } -dependencies = ["scikit-learn>=1.7.0"] +dependencies = ["scikit-learn>=1.7.0,!=1.7.1"] classifiers = [ "Development Status :: 4 - Beta", @@ -33,7 +33,7 @@ download = "https://pypi.org/project/fastcan/#files" tracker = "https://github.com/scikit-learn-contrib/fastcan/issues" [project.optional-dependencies] -docs = ["furo<2025.0.0", "matplotlib", "sphinx_gallery", "sphinx-design", "sphinxcontrib-plantuml"] +docs = ["furo", "matplotlib", "sphinx_gallery", "sphinx-design", "sphinxcontrib-plantuml"] [build-system] requires = ["meson-python>=0.18.0", "Cython>=3.1.0", "scikit-learn>=1.7.0"] @@ -51,7 +51,7 @@ platforms = ["win-64", "linux-64", "osx-64", "osx-arm64", "linux-aarch64"] [tool.pixi.dependencies] python = ">=3.13.0" -scikit-learn = ">=1.7.0" +scikit-learn = ">=1.7.0,!=1.7.1" [tool.pixi.pypi-dependencies] fastcan = { path = ".", editable = true } @@ -85,7 +85,7 @@ pip = "*" python-freethreading = "*" [tool.pixi.feature.nogil.pypi-dependencies] -scikit-learn = ">=1.7.0" +scikit-learn = ">=1.7.0,!=1.7.1" fastcan = { path = ".", editable = true } [tool.pixi.feature.nogil.build-dependencies]