Better Handling of Already Existing Packages

Author: jtpio

jupyter_releaser/lib.py

@@ -384,8 +384,13 @@ def publish_assets(dist_dir, npm_token, npm_cmd, twine_cmd, dry_run, use_checkou
             try:
                 util.run(f"{npm_cmd} {name}", cwd=dist_dir, quiet=True)
             except CalledProcessError as e:
-                if "EPUBLISHCONFLICT" not in e.stderr.decode("utf-8"):
-                    raise e
+                stderr = e.stderr.decode("utf-8")
+                if (
+                    "EPUBLISHCONFLICT" in stderr
+                    or "previously published versions" in stderr
+                ):
+                    continue
+                raise e
             found = True
         else:
             util.log(f"Nothing to upload for {name}")

jupyter_releaser/tests/test_cli.py

@@ -527,10 +527,11 @@ def test_publish_assets_npm_exists(npm_dist, runner, mocker):
     def wrapped(cmd, **kwargs):
         nonlocal called
         if cmd.startswith("npm publish --dry-run"):
-            err = CalledProcessError(1, "foo")
-            err.stderr = "EPUBLISHCONFLICT".encode("UTF-8")
             called += 1
-            raise err
+            if called == 0:
+                err = CalledProcessError(1, "foo")
+                err.stderr = "EPUBLISHCONFLICT".encode("UTF-8")
+                raise err
 
     mock_run = mocker.patch("jupyter_releaser.util.run", wraps=wrapped)
 
@@ -549,6 +550,36 @@ def wrapped(cmd, **kwargs):
     assert called == 3, called
 
 
+def test_publish_assets_npm_all_exists(npm_dist, runner, mocker):
+    dist_dir = npm_dist / util.CHECKOUT_NAME / "dist"
+    called = 0
+
+    def wrapped(cmd, **kwargs):
+        nonlocal called
+        if cmd.startswith("npm publish --dry-run"):
+            called += 1
+            err = CalledProcessError(1, "foo")
+            err.stderr = "previously published versions".encode("UTF-8")
+            raise err
+
+    mocker.patch("jupyter_releaser.util.run", wraps=wrapped)
+
+    with pytest.raises(ValueError):
+        runner(
+            [
+                "publish-assets",
+                "--npm-token",
+                "abc",
+                "--npm-cmd",
+                "npm publish --dry-run",
+                "--dist-dir",
+                dist_dir,
+            ]
+        )
+
+    assert called == 3, called
+
+
 def test_publish_release(npm_dist, runner, mocker, open_mock):
     open_mock.side_effect = [MockHTTPResponse([REPO_DATA]), MockHTTPResponse()]
     dist_dir = npm_dist / util.CHECKOUT_NAME / "dist"