Merge pull request #122 from fcollonval/fix/extract-config

Fix Extract Release Config and Npm Config Handling

Author: Steven Silvester

jupyter_releaser/lib.py

@@ -281,6 +281,11 @@ def extract_release(auth, dist_dir, dry_run, release_url, npm_install_options):
     orig_dir = os.getcwd()
     os.chdir(util.CHECKOUT_NAME)
 
+    # Read in the config
+    config = util.read_config()
+    options = config.get("options", {})
+    npm_install_options = npm_install_options or options.get("npm-install-options", "")
+
     # Clean the dist folder
     dist = Path(dist_dir)
     if dist.exists():
@@ -306,7 +311,7 @@ def extract_release(auth, dist_dir, dry_run, release_url, npm_install_options):
     for asset in assets:
         suffix = Path(asset.name).suffix
         if suffix in [".gz", ".whl"]:
-            python.check_dist(path)
+            python.check_dist(dist / asset.name)
         elif suffix == ".tgz":
             pass  # already handled
         else:
@@ -372,9 +377,9 @@ def publish_assets(dist_dir, npm_token, npm_cmd, twine_cmd, dry_run):
         os.environ.setdefault("TWINE_USERNAME", "__token__")
 
     if len(glob(f"{dist_dir}/*.tgz")):
-        npm.handle_npm_config(npm_token, os.getcwd())
+        npm.handle_npm_config(npm_token)
         if npm_token:
-            util.run("npm whoami", cwd=os.getcwd())
+            util.run("npm whoami")
 
     found = False
     for path in sorted(glob(f"{dist_dir}/*.*")):

jupyter_releaser/npm.py

@@ -123,17 +123,27 @@ def extract_package(path):
     return data
 
 
-def handle_npm_config(npm_token, dist_dir):
+def handle_npm_config(npm_token):
     """Handle npm_config"""
-    npmrc = Path(dist_dir) / Path(".npmrc")
+    npmrc = Path("~/.npmrc").expanduser()
     registry = os.environ.get("NPM_REGISTRY", "https://registry.npmjs.org/")
-    text = f"registry={registry}"
+    reg_entry = text = f"registry={registry}"
+    auth_entry = ""
     if npm_token:
-        registry = registry.replace("https:", "")
-        registry = registry.replace("http:", "")
-        text += f"\n{registry}:_authToken={npm_token}"
+        short_reg = registry.replace("https://", "//")
+        short_reg = short_reg.replace("http://", "//")
+        auth_entry = f"{short_reg}:_authToken={npm_token}"
+
+    # Handle existing config
     if npmrc.exists():
-        text = npmrc.read_text(encoding="utf-8") + text
+        text = npmrc.read_text(encoding="utf-8")
+        if reg_entry in text:
+            reg_entry = ""
+        if auth_entry in text:
+            auth_entry = ""
+
+    text += f"\n{reg_entry}\n{auth_entry}"
+    text = text.strip() + "\n"
     util.log(f"writing npm config to {npmrc}:\n{text}")
     npmrc.write_text(text, encoding="utf-8")
 

jupyter_releaser/tests/test_functions.py

@@ -1,7 +1,6 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 import json
-import os
 import shutil
 from pathlib import Path
 
@@ -121,10 +120,17 @@ def test_create_release_commit_hybrid(py_package, build_mock):
 
 
 def test_handle_npm_config(npm_package):
-    npm.handle_npm_config("abc", os.getcwd())
-    text = Path(".npmrc").read_text(encoding="utf-8")
+    npmrc = Path("~/.npmrc").expanduser()
+    existed = npmrc.exists()
+    if existed:
+        npmrc_text = npmrc.read_text(encoding="utf-8")
+    npm.handle_npm_config("abc")
+    text = npmrc.read_text(encoding="utf-8")
     assert "_authToken=abc" in text
 
+    if existed:
+        npmrc.write_text(npmrc_text, encoding="utf-8")
+
 
 def test_bump_version(py_package):
     for spec in ["1.0.1", "1.0.1.dev1", "1.0.3a4"]: