Merge branch 'main' into fix/validate-before-overwrite

Author: d-v-b

.github/workflows/zarr-http-server-release.yml

@@ -64,6 +64,34 @@ jobs:
           uv run --with "${wheel}" --python 3.12 --no-project \
             python -c "import zarr_http_server; print('zarr_http_server', zarr_http_server.__version__)"
 
+      # The sdist has to stand alone, and `hatch build` above builds the wheel
+      # from the source tree, not from the sdist. So build a wheel from the
+      # sdist with pip, which unpacks it under the sdist format's rules (no
+      # links out of the archive), then run the package's own tests and strict
+      # docs build from the unpacked sdist. This job has no checkout, so
+      # nothing comes from the repository; zarr, where a package uses it,
+      # resolves from PyPI.
+      - name: Build a wheel from the sdist with pip
+        run: |
+          sdist=$(ls dist/*.tar.gz)
+          uvx --python 3.12 pip@26.2.1 wheel --no-deps --wheel-dir sdist-wheel "${sdist}"
+
+      - name: Install just
+        uses: extractions/setup-crate@7577c1bdf2d95e6d65d532788f35ed79d4b1dda2 # v2.0.1
+        with:
+          repo: casey/just
+          version: 1.58.0
+
+      - name: Test and build docs from the unpacked sdist
+        env:
+          UV_PYTHON: '3.12'
+        run: |
+          mkdir sdist
+          tar -xzf dist/*.tar.gz -C sdist
+          cd sdist/*/
+          just test
+          just docs-check
+
   upload_pypi:
     name: Upload to PyPI
     needs: [build, test_artifacts]

.github/workflows/zarr-indexing-release.yml

@@ -64,6 +64,34 @@ jobs:
           uv run --with "${wheel}" --python 3.12 --no-project \
             python -c "import zarr_indexing; print('zarr_indexing', zarr_indexing.__version__)"
 
+      # The sdist has to stand alone, and `hatch build` above builds the wheel
+      # from the source tree, not from the sdist. So build a wheel from the
+      # sdist with pip, which unpacks it under the sdist format's rules (no
+      # links out of the archive), then run the package's own tests and strict
+      # docs build from the unpacked sdist. This job has no checkout, so
+      # nothing comes from the repository; zarr, where a package uses it,
+      # resolves from PyPI.
+      - name: Build a wheel from the sdist with pip
+        run: |
+          sdist=$(ls dist/*.tar.gz)
+          uvx --python 3.12 pip@26.2.1 wheel --no-deps --wheel-dir sdist-wheel "${sdist}"
+
+      - name: Install just
+        uses: extractions/setup-crate@7577c1bdf2d95e6d65d532788f35ed79d4b1dda2 # v2.0.1
+        with:
+          repo: casey/just
+          version: 1.58.0
+
+      - name: Test and build docs from the unpacked sdist
+        env:
+          UV_PYTHON: '3.12'
+        run: |
+          mkdir sdist
+          tar -xzf dist/*.tar.gz -C sdist
+          cd sdist/*/
+          just test
+          just docs-check
+
   upload_pypi:
     name: Upload to PyPI
     needs: [build, test_artifacts]

.github/workflows/zarr-metadata-release.yml

@@ -64,6 +64,34 @@ jobs:
           uv run --with "${wheel}" --python 3.12 --no-project \
             python -c "import zarr_metadata; print('zarr_metadata', zarr_metadata.__version__)"
 
+      # The sdist has to stand alone, and `hatch build` above builds the wheel
+      # from the source tree, not from the sdist. So build a wheel from the
+      # sdist with pip, which unpacks it under the sdist format's rules (no
+      # links out of the archive), then run the package's own tests and strict
+      # docs build from the unpacked sdist. This job has no checkout, so
+      # nothing comes from the repository; zarr, where a package uses it,
+      # resolves from PyPI.
+      - name: Build a wheel from the sdist with pip
+        run: |
+          sdist=$(ls dist/*.tar.gz)
+          uvx --python 3.12 pip@26.2.1 wheel --no-deps --wheel-dir sdist-wheel "${sdist}"
+
+      - name: Install just
+        uses: extractions/setup-crate@7577c1bdf2d95e6d65d532788f35ed79d4b1dda2 # v2.0.1
+        with:
+          repo: casey/just
+          version: 1.58.0
+
+      - name: Test and build docs from the unpacked sdist
+        env:
+          UV_PYTHON: '3.12'
+        run: |
+          mkdir sdist
+          tar -xzf dist/*.tar.gz -C sdist
+          cd sdist/*/
+          just test
+          just docs-check
+
   upload_pypi:
     name: Upload to PyPI
     needs: [build, test_artifacts]

.gitignore

@@ -96,5 +96,3 @@ zarr.egg-info/
 .claude/
 CLAUDE.md
 docs/superpowers/
-# zarr-metadata package lockfile (a library, not an app)
-packages/zarr-metadata/uv.lock

changes/4407.misc.md

@@ -0,0 +1 @@
+Building `zarr` from source now requires `setuptools-scm>=9`, which replaces the deprecated `git_describe_command` version option with `scm.git.describe_command`.

packages/zarr-http-server/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["hatchling>=1.29.0", "hatch-vcs"]
+requires = ["hatchling>=1.29.0", "hatch-vcs", "setuptools-scm>=9"]
 build-backend = "hatchling.build"
 
 [project]
@@ -82,7 +82,7 @@ tag-pattern = '^zarr_http_server-v(?P<version>.+)$'
 # `git_describe_command` ensures we get the zarr_http_server tags instead of latest.
 # `local_scheme` strips the git commit info so the appending info is just a counter from latest tag.
 # test-pypi doesn't accept git commit info in tags, and the count should be enough to distinguish unique runs.
-raw-options = { root = "../..", git_describe_command = "git describe --dirty --tags --long --match zarr_http_server-v*", local_scheme = "no-local-version" }
+raw-options = { root = "../..", scm = { git = { describe_command = "git describe --dirty --tags --long --match zarr_http_server-v*" } }, local_scheme = "no-local-version" }
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/zarr_http_server"]

packages/zarr-indexing/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["hatchling>=1.29.0", "hatch-vcs"]
+requires = ["hatchling>=1.29.0", "hatch-vcs", "setuptools-scm>=9"]
 build-backend = "hatchling.build"
 
 [project]
@@ -73,7 +73,7 @@ tag-pattern = '^zarr_indexing-v(?P<version>.+)$'
 # `git_describe_command` ensures we get the zarr_indexing tags instead of latest.
 # `local_scheme` strips the git commit info so the appending info is just a counter from latest tag.
 # test-pypi doesn't accept git commit info in tags, and the count should be enough to distinguish unique runs.
-raw-options = { root = "../..", git_describe_command = "git describe --dirty --tags --long --match zarr_indexing-v*", local_scheme = "no-local-version" }
+raw-options = { root = "../..", scm = { git = { describe_command = "git describe --dirty --tags --long --match zarr_indexing-v*" } }, local_scheme = "no-local-version" }
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/zarr_indexing"]

packages/zarr-metadata/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["hatchling>=1.29.0", "hatch-vcs"]
+requires = ["hatchling>=1.29.0", "hatch-vcs", "setuptools-scm>=9"]
 build-backend = "hatchling.build"
 
 [project]
@@ -68,7 +68,7 @@ tag-pattern = '^zarr_metadata-v(?P<version>.+)$'
 # `git_describe_command` ensures we get the zarr_metadata tags instead of latest.
 # `local_scheme` strips the git commit info so the appending info is just a counter from latest tag.
 # test-pypi doesn't accept git commit info in tags, and the count should be enough to distinguish unique runs.
-raw-options = { root = "../..", git_describe_command = "git describe --dirty --tags --long --match zarr_metadata-v*", local_scheme = "no-local-version" }
+raw-options = { root = "../..", scm = { git = { describe_command = "git describe --dirty --tags --long --match zarr_metadata-v*" } }, local_scheme = "no-local-version" }
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/zarr_metadata"]