From 86e9395e4ade27745aefffe922d1f7ea5410b753 Mon Sep 17 00:00:00 2001 From: Thomas S Date: Wed, 16 Oct 2024 11:20:25 +0200 Subject: [PATCH] Clean --- .github/workflows/skore.yml | 4 +--- skore/hatch/metadata.py | 12 +++++------- skore/tests/unit/utils/test_show_versions.py | 18 ++++++++++++++++++ 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/.github/workflows/skore.yml b/.github/workflows/skore.yml index 96af4cb6..bc02a9e2 100644 --- a/.github/workflows/skore.yml +++ b/.github/workflows/skore.yml @@ -36,9 +36,7 @@ jobs: fail-fast: true matrix: os: ['ubuntu-latest', 'windows-latest'] - python-version: ['3.12'] - # os: ['ubuntu-latest', 'windows-latest'] - # python-version: ['3.9', '3.10', '3.11', '3.12'] + python-version: ['3.9', '3.10', '3.11', '3.12'] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/skore/hatch/metadata.py b/skore/hatch/metadata.py index 04747b7f..8226addd 100644 --- a/skore/hatch/metadata.py +++ b/skore/hatch/metadata.py @@ -6,15 +6,13 @@ class MetadataHook(MetadataHookInterface): def update(self, metadata): + license = Path(self.root, self.config["license-file"]).read_text() + readme = Path(self.root, self.config["readme-file"]).read_text() version = self.config["version-default"] - readme = Path(self.root, self.config["readme-file"]).read_text(encoding="utf8") - license = Path(self.root, self.config["license-file"]).read_text( - encoding="utf8" - ) with suppress(FileNotFoundError): - version = Path(self.root, "VERSION.txt").read_text(encoding="utf8") + version = Path(self.root, "VERSION.txt").read_text() - metadata["version"] = version - metadata["readme"] = {"text": readme, "content-type": "text/markdown"} metadata["license"] = {"text": license, "content-type": "text/plain"} + metadata["readme"] = {"text": readme, "content-type": "text/markdown"} + metadata["version"] = version diff --git a/skore/tests/unit/utils/test_show_versions.py b/skore/tests/unit/utils/test_show_versions.py index 634db9d8..13ed6888 100644 --- a/skore/tests/unit/utils/test_show_versions.py +++ b/skore/tests/unit/utils/test_show_versions.py @@ -1,3 +1,6 @@ +import os +import tempfile + from skore.utils._show_versions import _get_deps_info, _get_sys_info, show_versions @@ -26,3 +29,18 @@ def test_show_versions(capfd): assert "pip" in captured.out assert "setuptools" in captured.out assert "skore" in captured.out + + +def test_get_deps_in_any_working_directory(capfd): + cwd = os.getcwd() + with tempfile.TemporaryDirectory() as temp_dir: + os.chdir(temp_dir) + show_versions() + captured = capfd.readouterr() + assert "python" in captured.out + assert "executable" in captured.out + assert "machine" in captured.out + assert "pip" in captured.out + assert "setuptools" in captured.out + assert "skore" in captured.out + os.chdir(cwd)