From 62704e227d52b22d87abe4bbf0aa174c02b1e311 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 7 Aug 2024 16:27:13 -0400 Subject: [PATCH] chore: minor touchup Signed-off-by: Henry Schreiner --- .github/workflows/tests.yml | 2 +- .gitignore | 3 +++ pyproject.toml | 19 ++++++++++++------- src/boost_histogram/version.pyi | 1 - 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 95916d74..da383ca7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -86,7 +86,7 @@ jobs: create-symlink: true - name: Install python tools - run: uv pip install --system -r dev-requirements.txt pytest-github-actions-annotate-failures 'numpy>=2.0.0b1; python_version>="3.9"' + run: uv pip install --system -r dev-requirements.txt pytest-github-actions-annotate-failures - name: Configure run: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Debug -DBOOST_HISTOGRAM_ERRORS=ON ${{ matrix.cmake-extras }} diff --git a/.gitignore b/.gitignore index 8f81fdce..887f921c 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,6 @@ compile_commands.json # Cache /emsdk-cache/* + +# Nox +.nox/* diff --git a/pyproject.toml b/pyproject.toml index 7d6809b9..de836be7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["scikit-build-core>=0.9", "pybind11>=2.12"] +requires = ["scikit-build-core>=0.10", "pybind11>=2.12"] build-backend = "scikit_build_core.build" [project] @@ -9,7 +9,8 @@ description = "The Boost::Histogram Python wrapper." readme = "README.md" requires-python = ">=3.7" authors = [ - { name = "Hans Dembinski and Henry Schreiner", email = "hschrein@cern.ch" }, + { name = "Hans Dembinski", email = "hans.dembinski@gmail.com" }, + { name = "Henry Schreiner", email = "hschrein@cern.ch" }, ] keywords = [ "boost-histogram", @@ -91,11 +92,9 @@ Homepage = "https://github.com/scikit-hep/boost-histogram" [tool.scikit-build] +minimum-version = "build-system.requires" +cmake.version = "CMakeLists.txt" metadata.version.provider = "scikit_build_core.metadata.setuptools_scm" -sdist.include = ["src/boost_histogram/version.py"] -wheel.expand-macos-universal-tags = true -minimum-version = "0.9" -cmake.version = ">=3.24" sdist.exclude = [ "extern/**/*.py", "extern/**/*.md", @@ -113,8 +112,14 @@ sdist.exclude = [ ] +[[tool.scikit-build.generate]] +path = "boost_histogram/version.py" +template = ''' +__version__ = version = '$version' +''' + + [tool.setuptools_scm] -write_to = "src/boost_histogram/version.py" [tool.pytest.ini_options] diff --git a/src/boost_histogram/version.pyi b/src/boost_histogram/version.pyi index 91744f98..502a8eeb 100644 --- a/src/boost_histogram/version.pyi +++ b/src/boost_histogram/version.pyi @@ -1,4 +1,3 @@ from __future__ import annotations version: str -version_tuple: tuple[int, int, int] | tuple[int, int, int, str, str]