From 96e6497bc3bd6b35df9a54692f1dd95ec6be0d7a Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Thu, 19 Dec 2024 12:55:03 -0500 Subject: [PATCH 1/6] chore: Pin hatchling 1.26 for build --- pyproject.toml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b1d4bb0318..d71b087a4c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,11 @@ [build-system] -requires = ["hatchling", "hatch-vcs"] +# Pin hatchling 1.26 to keep metadata 2.3 +# The hynek/build-and-inspect-python-package action is pinned at 2.8, +# which in turn pins a twine that rejects 2.4. +# Until uv build fixes a problem with its tar library, we're stuck here. +# https://github.com/hynek/build-and-inspect-python-package/issues/155 +# https://github.com/astral-sh/uv/issues/5450 +requires = ["hatchling~=1.26.3", "hatch-vcs"] build-backend = "hatchling.build" [project] From cf1dcd6581930f63ad20f8ece83249a07b7f8bc6 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Thu, 19 Dec 2024 12:55:21 -0500 Subject: [PATCH 2/6] chore(tox): Use unsafe-best-match to fetch pre-release wheels --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index d240fb4f28..4dd26f519f 100644 --- a/tox.ini +++ b/tox.ini @@ -60,7 +60,8 @@ deps = extras = tests setenv = pre: PIP_EXTRA_INDEX_URL=https://pypi.anaconda.org/scientific-python-nightly-wheels/simple - pre: UV_EXTRA_INDEX_URL=https://pypi.anaconda.org/scientific-python-nightly-wheels/simple + pre: UV_INDEX=https://pypi.anaconda.org/scientific-python-nightly-wheels/simple + pre: UV_INDEX_STRATEGY=unsafe-best-match FSLOUTPUTTYPE=NIFTI_GZ uv_resolution = min: lowest-direct From 41afa032ff2640d8898f03c23ba96387cd812ea3 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Thu, 19 Dec 2024 14:27:35 -0500 Subject: [PATCH 3/6] chore(ci): Fix artifact download --- .github/workflows/build_test_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml index 73faceb230..f075f44891 100644 --- a/.github/workflows/build_test_deploy.yml +++ b/.github/workflows/build_test_deploy.yml @@ -193,7 +193,7 @@ jobs: - name: Download packages built by build-and-inspect-python-package uses: actions/download-artifact@v4 with: - name: Packages + pattern: Packages-* path: dist - name: Upload package to PyPI From df15b7a2f1ceb7e1b1f2ac8c6ebd65bb870e1787 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Thu, 19 Dec 2024 15:17:33 -0500 Subject: [PATCH 4/6] chore(ci): Only test sdist once --- .github/workflows/build_test_deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml index f075f44891..e8251498b9 100644 --- a/.github/workflows/build_test_deploy.yml +++ b/.github/workflows/build_test_deploy.yml @@ -131,6 +131,7 @@ jobs: matrix: os: ["ubuntu-latest"] python-version: ["3.12"] + dependencies: ["latest"] env: DEPENDS: ${{ matrix.dependencies }} From 55d624658a56b4ba9d959c25d6b3ba6f7a15665b Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Thu, 19 Dec 2024 14:52:22 -0500 Subject: [PATCH 5/6] chore(ci): Set packages-dir for uploads --- .github/workflows/build_test_deploy.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml index e8251498b9..e705d9ebb7 100644 --- a/.github/workflows/build_test_deploy.yml +++ b/.github/workflows/build_test_deploy.yml @@ -199,6 +199,13 @@ jobs: - name: Upload package to PyPI uses: pypa/gh-action-pypi-publish@release/v1 + with: + packages-dir: dist/Packages-main/ + + - name: Upload package to PyPI + uses: pypa/gh-action-pypi-publish@release/v1 + with: + packages-dir: dist/Packages-wrapper/ checks: runs-on: "ubuntu-latest" From 9636db4b18084dfaca1ef62e6fcabc5750343128 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Thu, 19 Dec 2024 12:36:20 -0500 Subject: [PATCH 6/6] rel(0.17.0): Release notes --- CHANGES.rst | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 99baac1797..28b4924905 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,25 @@ +0.17.0 (December 19, 2024) +========================== +New feature release in the 0.17.x series. + +This release improves handling of datasets where T1w images are not +the primary modality. It also supports the generation of fsLR meshes +on the subject surface with the names: + +``` +sub-