calkit-python 0.45.2__py3-none-any.whl → 0.45.3__py3-none-any.whl

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/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.dist-info → calkit_python-0.45.3.dist-info}/METADATA

@@ -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.dist-info → calkit_python-0.45.3.dist-info}/RECORD

@@ -46,7 +46,7 @@ calkit/cli/hub.py,sha256=ZBOlL7-mV57q_ynr4hPuhV7NlkKEkINSRksXD-jjiOg,2972
 calkit/cli/import_.py,sha256=ZAfPstDm_EoG9i8RMvVfctLOFMv0GbstkH0Wb7iq-9Q,18875
 calkit/cli/latex.py,sha256=mvNxzZkWlwJnYA_l6NFEflV0AGYHPIT1ALUxQQGHZJ0,19708
 calkit/cli/list.py,sha256=E40uJe_jRQcRin1RO4yFMUncKMpQe2syWhC54xzDhoQ,15090
-calkit/cli/new.py,sha256=SLhotKsToW0rNo7C2e5uLz9ESvBgnQwprkQqX51A50Y,149508
+calkit/cli/new.py,sha256=t3CHyNFTnzKUAuph31HsWuUxK4iw7s28IVC5STSTxy0,149724
 calkit/cli/notebooks.py,sha256=aR4I0qatOtkrAxEG5PVLej20SBLKo8qr-lxDSzgljUQ,38836
 calkit/cli/office.py,sha256=jVSTvbl91TCzlglST5O2b8hdApZA_QHw_UiEQFJqxdc,1754
 calkit/cli/overleaf.py,sha256=PTL3MH3y3qlSCkZ39yaiWUWU6U7aiGyh6aKLA068-5U,38700
@@ -135,7 +135,7 @@ calkit/tests/cli/test_hub.py,sha256=z3ne8Bnjv-V85OEh15FbAV4STrFwZKMgl_DgWwQ2wzY,
 calkit/tests/cli/test_import.py,sha256=e2BToVPebf4NalFQuIgyTNJHwbc9VMc6AYO-FAhYbQ0,663
 calkit/tests/cli/test_latex.py,sha256=92ZhSIYOiBb0TKZmODTVvkp0dU_X5ZuGvrdA4v5bzQo,10976
 calkit/tests/cli/test_list.py,sha256=5jc_OYI_rXNVv2UQc6IS8ItjQbBwEI5IDw5xKU_Uk98,9165
-calkit/tests/cli/test_new.py,sha256=tDat19K_ussPHlYYjqhKFKQUNNbHboiYpn79v0XGdqo,65017
+calkit/tests/cli/test_new.py,sha256=q7kmZQ9IrMhDOcHuIXU0GJs0Z54SpX12vct8ntQaKLM,66977
 calkit/tests/cli/test_notebooks.py,sha256=2t1KiGhEz9H9LcIdWy4jGM05REUxJpWiIg6fSpX12ME,10678
 calkit/tests/cli/test_overleaf.py,sha256=w8tqRwOC6ilQX8wfkqppTBmcouxs61zEoq-R5G1emY8,49767
 calkit/tests/cli/test_scheduler.py,sha256=YfJi_fcRlQt1bdFyo3b8BFelA1PcH-wn5lAVXiH7Zj4,24109
@@ -159,22 +159,22 @@ calkit/tests/models/test_pipeline.py,sha256=hglkTBry1ONKbzN1HmlpefbrqAbc-668C0MQ
 calkit/agent_skills/add-pipeline-stage/SKILL.md,sha256=kpYYb-rJsS4B9p1Ub3gL21irCG5ZZ4DvWZpdJeEwPZk,3772
 calkit/agent_skills/conventions/SKILL.md,sha256=osbAtYU0AwROZHgmOoQYbqYr3JwG_v-cJAmandm7yN4,9738
 calkit/agent_skills/create-pipeline/SKILL.md,sha256=2FGw1iDQVRk5FUq79GP3lPdgvgof2Wi1O9O-abGGtgs,5422
-calkit_python-0.45.2.data/data/etc/jupyter/jupyter_server_config.d/calkit.json,sha256=CWrZP--JDGz8fsvbAlKr_duTL1vDriGT48SL1YCtkY0,81
-calkit_python-0.45.2.data/data/share/jupyter/labextensions/calkit/package.json,sha256=tYRdVVqmPBoUJzNrMc7Da9Lk-NB54vhnplKRSlOTMIE,6224
-calkit_python-0.45.2.data/data/share/jupyter/labextensions/calkit/schemas/calkit/package.json.orig,sha256=NBG3t7gFYb6_2J-yPU29qS7Ck9pYgm8-wC5Q1LrzQeI,6082
-calkit_python-0.45.2.data/data/share/jupyter/labextensions/calkit/schemas/calkit/plugin.json,sha256=YSpIrwpwB-lQBk9Mwv-npedWTOOZreO6nlWZhqlWyGI,840
-calkit_python-0.45.2.data/data/share/jupyter/labextensions/calkit/static/502.9a2c5772a15466e923ef.js,sha256=mixXcqFUZukj7_jQVxHTavsYl7cdZv83sEe4phJgkh0,59893
-calkit_python-0.45.2.data/data/share/jupyter/labextensions/calkit/static/695.2c41003a452d43d2b358.js,sha256=LEEAOkUtQ9KzWEHn-QFv5yGi70B-sBOnrvztzHr0Shw,223
-calkit_python-0.45.2.data/data/share/jupyter/labextensions/calkit/static/867.a42a046aa5108f54f8fb.js,sha256=pCoEaqUQj1T4-zAc9SUd__9ZGm7uL2wHQve2xwL89NI,8156
-calkit_python-0.45.2.data/data/share/jupyter/labextensions/calkit/static/909.6d8285ce7c45878ac508.js,sha256=bYKFznxFh4rFCPs8tWnbZgaFGp72DuPZGdkzYCoCaSU,114583
-calkit_python-0.45.2.data/data/share/jupyter/labextensions/calkit/static/946.050af2abf7845cfbdbd2.js,sha256=n_a0yu_gE7l6fauyoXXv9BZ7ZEYt2387mTfs7CbLcs4,51939
-calkit_python-0.45.2.data/data/share/jupyter/labextensions/calkit/static/946.050af2abf7845cfbdbd2.js.LICENSE.txt,sha256=eNJ8gc9n9IF8nW1d9sI9niuHstYzjNz5vqXx9UgWSPc,249
-calkit_python-0.45.2.data/data/share/jupyter/labextensions/calkit/static/b2f1c3efe70cb539d121.png,sha256=svHD7-cMtTnRITFwugwsVaB9nZ-h8A61ose8z32HiRE,24850
-calkit_python-0.45.2.data/data/share/jupyter/labextensions/calkit/static/remoteEntry.d7a43c7948f690d37d19.js,sha256=16Q8eUj2kNN9Gaeoe3hOSEUPMJ5IUHQnJF1h9DRUIJY,8737
-calkit_python-0.45.2.data/data/share/jupyter/labextensions/calkit/static/style.js,sha256=r89Jlk5v1drcwhCpv9FnC3Jig_JH4k24kZNIvxh6Htk,149
-calkit_python-0.45.2.data/data/share/jupyter/labextensions/calkit/static/third-party-licenses.json,sha256=2BGdItLJwO3fAopLl4eJvp26TEwuscYC0-yFaF-LaLU,13683
-calkit_python-0.45.2.dist-info/METADATA,sha256=Rr27zNPVQ_KH7uaw8FcHthxM9g6dHF_jsYw6aTp8qhA,12818
-calkit_python-0.45.2.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
-calkit_python-0.45.2.dist-info/entry_points.txt,sha256=2iQBBzjTAOdk66CwS-f3ecXXW5DjUqkG1KBRj8mHI1I,133
-calkit_python-0.45.2.dist-info/licenses/LICENSE,sha256=9ZamCaSUTZk9rcrnf-sWFKLOHr3ws-S_dgKMegW4nw8,1056
-calkit_python-0.45.2.dist-info/RECORD,,
+calkit_python-0.45.3.data/data/etc/jupyter/jupyter_server_config.d/calkit.json,sha256=CWrZP--JDGz8fsvbAlKr_duTL1vDriGT48SL1YCtkY0,81
+calkit_python-0.45.3.data/data/share/jupyter/labextensions/calkit/package.json,sha256=tYRdVVqmPBoUJzNrMc7Da9Lk-NB54vhnplKRSlOTMIE,6224
+calkit_python-0.45.3.data/data/share/jupyter/labextensions/calkit/schemas/calkit/package.json.orig,sha256=NBG3t7gFYb6_2J-yPU29qS7Ck9pYgm8-wC5Q1LrzQeI,6082
+calkit_python-0.45.3.data/data/share/jupyter/labextensions/calkit/schemas/calkit/plugin.json,sha256=YSpIrwpwB-lQBk9Mwv-npedWTOOZreO6nlWZhqlWyGI,840
+calkit_python-0.45.3.data/data/share/jupyter/labextensions/calkit/static/502.9a2c5772a15466e923ef.js,sha256=mixXcqFUZukj7_jQVxHTavsYl7cdZv83sEe4phJgkh0,59893
+calkit_python-0.45.3.data/data/share/jupyter/labextensions/calkit/static/695.2c41003a452d43d2b358.js,sha256=LEEAOkUtQ9KzWEHn-QFv5yGi70B-sBOnrvztzHr0Shw,223
+calkit_python-0.45.3.data/data/share/jupyter/labextensions/calkit/static/867.a42a046aa5108f54f8fb.js,sha256=pCoEaqUQj1T4-zAc9SUd__9ZGm7uL2wHQve2xwL89NI,8156
+calkit_python-0.45.3.data/data/share/jupyter/labextensions/calkit/static/909.6d8285ce7c45878ac508.js,sha256=bYKFznxFh4rFCPs8tWnbZgaFGp72DuPZGdkzYCoCaSU,114583
+calkit_python-0.45.3.data/data/share/jupyter/labextensions/calkit/static/946.050af2abf7845cfbdbd2.js,sha256=n_a0yu_gE7l6fauyoXXv9BZ7ZEYt2387mTfs7CbLcs4,51939
+calkit_python-0.45.3.data/data/share/jupyter/labextensions/calkit/static/946.050af2abf7845cfbdbd2.js.LICENSE.txt,sha256=eNJ8gc9n9IF8nW1d9sI9niuHstYzjNz5vqXx9UgWSPc,249
+calkit_python-0.45.3.data/data/share/jupyter/labextensions/calkit/static/b2f1c3efe70cb539d121.png,sha256=svHD7-cMtTnRITFwugwsVaB9nZ-h8A61ose8z32HiRE,24850
+calkit_python-0.45.3.data/data/share/jupyter/labextensions/calkit/static/remoteEntry.d7a43c7948f690d37d19.js,sha256=16Q8eUj2kNN9Gaeoe3hOSEUPMJ5IUHQnJF1h9DRUIJY,8737
+calkit_python-0.45.3.data/data/share/jupyter/labextensions/calkit/static/style.js,sha256=r89Jlk5v1drcwhCpv9FnC3Jig_JH4k24kZNIvxh6Htk,149
+calkit_python-0.45.3.data/data/share/jupyter/labextensions/calkit/static/third-party-licenses.json,sha256=2BGdItLJwO3fAopLl4eJvp26TEwuscYC0-yFaF-LaLU,13683
+calkit_python-0.45.3.dist-info/METADATA,sha256=Z809eOplrqKq9iYfrwUT3yBjzhSR1dfjXNPaHMaaG8w,12816
+calkit_python-0.45.3.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+calkit_python-0.45.3.dist-info/entry_points.txt,sha256=TtpHpcv2vFVAVYxFVp0XrwCV_z7FWIOguEiypXRDoOw,131
+calkit_python-0.45.3.dist-info/licenses/LICENSE,sha256=9ZamCaSUTZk9rcrnf-sWFKLOHr3ws-S_dgKMegW4nw8,1056
+calkit_python-0.45.3.dist-info/RECORD,,

{calkit_python-0.45.2.dist-info → calkit_python-0.45.3.dist-info}/entry_points.txt

@@ -1,7 +1,7 @@
 [console_scripts]
-calk9 = calkit.cli:run
 calkit = calkit.cli:run
 ck = calkit.cli:run
+ck9 = calkit.cli:run
 
 [fsspec.specs]
 ck = calkit.fs:CalkitFileSystem