calkit-python 0.45.2__tar.gz → 0.45.3__tar.gz

{calkit_python-0.45.2 → calkit_python-0.45.3}/.dockerignore

@@ -21,7 +21,7 @@ site
 docs
 examples
 test
-calk9
+ck9
 jupyterlab-ext
 vscode-ext
 hub/frontend

{calkit_python-0.45.2 → calkit_python-0.45.3}/.gitignore

@@ -17,7 +17,7 @@ node_modules
 calkit/labextension
 coverage
 junit.xml
-calk9
+ck9
 dist
 *.vsix
 vscode-ext/out

{calkit_python-0.45.2 → calkit_python-0.45.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: calkit-python
-Version: 0.45.2
+Version: 0.45.3
 Summary: Reproducibility simplified.
 Project-URL: Homepage, https://calkit.org
 Project-URL: Issues, https://github.com/calkit/calkit/issues
@@ -192,7 +192,7 @@ If you want to use Calkit without installing it,
 you can use uv's `uvx` command to run it directly:
 
 ```sh
-uvx calk9 --help
+uvx ck9 --help
 ```
 
 ### Nix

{calkit_python-0.45.2 → calkit_python-0.45.3}/README.md

@@ -133,7 +133,7 @@ If you want to use Calkit without installing it,
 you can use uv's `uvx` command to run it directly:
 
 ```sh
-uvx calk9 --help
+uvx ck9 --help
 ```
 
 ### Nix

{calkit_python-0.45.2 → calkit_python-0.45.3}/calkit/cli/new.py

@@ -3710,6 +3710,9 @@ def new_release(
             f"'{project_name}'."
         )
         record_id = None
+        # SPDX IDs are case-insensitive, but the InvenioRDM license vocabulary
+        # used by Zenodo and CaltechDATA only accepts them lowercased
+        license_ids = [lid.strip().lower() for lid in license_ids]
         # Detect project license IDs if necessary
         if not license_ids:
             license_file = calkit.licenses.find_license_file()
@@ -3756,7 +3759,7 @@ def new_release(
             publication_date=release_date,
             version=name,
             publisher=publisher_name,
-            rights=[{"id": lid for lid in license_ids}],
+            rights=[{"id": lid} for lid in license_ids],
         )
         # Add related identifiers
         github_url = calkit.detect_project_github_url()

{calkit_python-0.45.2 → calkit_python-0.45.3}/calkit/tests/cli/test_new.py

@@ -1100,6 +1100,10 @@ def test_new_nix_env_stages_flake(tmp_dir):
 def test_new_release(tmp_dir, monkeypatch, httpserver):
     # Set up a mock Zenodo API so the test doesn't depend on the real sandbox
     record_id = "test-record-abc123"
+    # A new version of a record gets its own ID, which the client must switch
+    # to; only the draft endpoints below are shared between the two
+    version_record_id = "test-record-def456"
+    any_record_id = f"(?:{record_id}|{version_record_id})"
     doi = "10.5072/zenodo.test123"
     # Point the Zenodo base URL at the local mock server and provide a dummy
     # token so no real credentials are needed.  Both env vars are inherited
@@ -1115,26 +1119,27 @@ def test_new_release(tmp_dir, monkeypatch, httpserver):
     ).respond_with_json({"id": record_id, "pids": {}})
     # POST /records/{id}/draft/files – initiate a file upload slot
     httpserver.expect_request(
-        re.compile(rf"^/records/{record_id}/draft/files$"), method="POST"
+        re.compile(rf"^/records/{any_record_id}/draft/files$"), method="POST"
     ).respond_with_json({"entries": []})
     # PUT /records/{id}/draft/files/{filename}/content – stream file bytes
     httpserver.expect_request(
-        re.compile(rf"^/records/{record_id}/draft/files/.+/content$"),
+        re.compile(rf"^/records/{any_record_id}/draft/files/.+/content$"),
         method="PUT",
     ).respond_with_data("", status=200)
     # POST /records/{id}/draft/files/{filename}/commit – finalise upload
     httpserver.expect_request(
-        re.compile(rf"^/records/{record_id}/draft/files/.+/commit$"),
+        re.compile(rf"^/records/{any_record_id}/draft/files/.+/commit$"),
         method="POST",
     ).respond_with_json({"key": "file", "status": "completed"})
     # POST /records/{id}/draft/pids/doi – reserve a DOI for a draft
     httpserver.expect_request(
-        re.compile(rf"^/records/{record_id}/draft/pids/doi$"), method="POST"
+        re.compile(rf"^/records/{any_record_id}/draft/pids/doi$"),
+        method="POST",
     ).respond_with_json({"pids": {"doi": {"identifier": doi}}})
     # GET /records/{id}/draft/files – list files already in the draft
     # (used by --reupload to decide which files to delete first)
     httpserver.expect_request(
-        re.compile(rf"^/records/{record_id}/draft/files$"), method="GET"
+        re.compile(rf"^/records/{any_record_id}/draft/files$"), method="GET"
     ).respond_with_json({"entries": []})
     # POST /records/{id}/draft/actions/publish – publish the draft
     httpserver.expect_request(
@@ -1143,6 +1148,16 @@ def test_new_release(tmp_dir, monkeypatch, httpserver):
     ).respond_with_json(
         {"id": record_id, "pids": {"doi": {"identifier": doi}}}
     )
+    # POST /records/{id}/versions – create a new version of a record, and
+    # PUT /records/{new_id}/draft – set that new version's metadata; the draft
+    # is only mocked under the new ID, so a client that failed to switch to it
+    # would get no response here
+    httpserver.expect_request(
+        re.compile(rf"^/records/{record_id}/versions$"), method="POST"
+    ).respond_with_json({"id": version_record_id, "pids": {}})
+    httpserver.expect_request(
+        re.compile(rf"^/records/{version_record_id}/draft$"), method="PUT"
+    ).respond_with_json({"id": version_record_id, "pids": {}})
     # GET /records/{id} – fetch the published record for post-test assertions
     httpserver.expect_request(
         re.compile(rf"^/records/{record_id}$"), method="GET"
@@ -1267,7 +1282,6 @@ def test_new_release(tmp_dir, monkeypatch, httpserver):
     git_tags = git.Repo().tags
     assert "v0.1.0" in [tag.name for tag in git_tags]
     # Check the license is correct
-    # TODO: It seems like we can't use multiple license IDs with the API
     record_id = release["record_id"]
     record = calkit.invenio.get(f"/records/{record_id}")
     metadata = record["metadata"]
@@ -1275,6 +1289,36 @@ def test_new_release(tmp_dir, monkeypatch, httpserver):
     assert metadata["license"] == {"id": "cc-by-4.0"}
     related = metadata["related_identifiers"]
     assert related[0]["identifier"] == "https://github.com/calkit/test-project"
+    # Issue #1582: SPDX IDs are case-insensitive, but the InvenioRDM license
+    # vocabulary rejects anything but the lowercase form, so release again
+    # with the licenses spelled in uppercase to check they are normalized
+    subprocess.check_call(
+        [
+            "calkit",
+            "new",
+            "release",
+            "--name",
+            "v0.2.0",
+            "--license",
+            "MIT",
+            "--license",
+            "CC-BY-4.0",
+            "--draft",
+            "--no-github",
+        ]
+    )
+    # Every set of metadata sent to the service should have carried both
+    # licenses as separate lowercase rights entries, rather than collapsing
+    # them into one: the first release detected them from the LICENSE file,
+    # the second took them from the uppercase --license options
+    rights_sent = [
+        body["metadata"]["rights"]
+        for request, _ in httpserver.log
+        if (body := request.get_json(silent=True)) and "metadata" in body
+    ]
+    expected_rights = [{"id": "mit"}, {"id": "cc-by-4.0"}]
+    assert len(rights_sent) >= 2
+    assert rights_sent == [expected_rights] * len(rights_sent)
     # TODO: Test that we can delete the release
     # This will fail if it's not a draft
     # subprocess.check_call(

{calkit_python-0.45.2 → calkit_python-0.45.3}/docs/installation.md

@@ -48,7 +48,7 @@ If you want to use Calkit without installing it,
 you can use uv's `uvx` command to run it directly:
 
 ```sh
-uvx calk9 --help
+uvx ck9 --help
 ```
 
 ## Nix

{calkit_python-0.45.2 → calkit_python-0.45.3}/pyproject.toml

@@ -106,7 +106,7 @@ ck = "calkit.fs:CalkitFileSystem"
 
 [project.scripts]
 calkit = "calkit.cli:run"
-calk9 = "calkit.cli:run"
+ck9 = "calkit.cli:run"
 ck = "calkit.cli:run"
 
 [tool.hatch.build.targets.wheel]

calkit_python-0.45.2/scripts/make-calk9.sh → calkit_python-0.45.3/scripts/make-ck9.sh

@@ -4,18 +4,18 @@ set -e
 # Get version from VCS via hatch
 VERSION="$(uvx --with 'virtualenv<20.29.0' hatch version)"
 
-# Create calk9 directory structure
-rm -rf calk9
-mkdir -p calk9
+# Create ck9 directory structure
+rm -rf ck9
+mkdir -p ck9
 
 # Create pyproject.toml
-cat > calk9/pyproject.toml <<EOF
+cat > ck9/pyproject.toml <<EOF
 [build-system]
 requires = ["setuptools>=69"]
 build-backend = "setuptools.build_meta"
 
 [project]
-name = "calk9"
+name = "ck9"
 version = "$VERSION"
 description = "Reproducibility simplified."
 readme = "README.md"
@@ -29,30 +29,30 @@ Homepage = "https://calkit.org"
 Repository = "https://github.com/calkit/calkit"
 
 [project.scripts]
-calk9 = "calkit.cli:run"
+ck9 = "calkit.cli:run"
 EOF
 
 # Create README.md
-cat > calk9/README.md <<EOF
-# calk9
+cat > ck9/README.md <<EOF
+# ck9
 
 Alias package for [calkit-python](https://pypi.org/project/calkit-python/).
 
-This package provides the \`calk9\` command as a shorter alternative to \`calkit\`.
+This package provides the \`ck9\` command as a shorter alternative to \`calkit\`.
 
 ## Installation
 
 \`\`\`sh
-pip install calk9
+pip install ck9
 \`\`\`
 
 Or use with uvx without installation:
 
 \`\`\`sh
-uvx calk9 --help
+uvx ck9 --help
 \`\`\`
 
 See the [Calkit documentation](https://docs.calkit.org) for more information.
 EOF
 
-echo "Created calk9/ package with version $VERSION"
+echo "Created ck9/ package with version $VERSION"