Merge pull request #152 from jtpio/settings-registry

Move registry options to settings

Author: Steven Silvester

.github/workflows/publish-release.yml

@@ -5,12 +5,6 @@ on:
       release_url:
         description: "The URL of the draft GitHub release"
         required: true
-      pypi_registry:
-        description: "The PYPI registry"
-        default: https://pypi.org/simple/
-      npm_registry:
-        description: "The npm registry"
-        default: https://registry.npmjs.org/
 jobs:
   publish_release:
     runs-on: ubuntu-latest
@@ -39,9 +33,7 @@ jobs:
           PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
           PYPI_TOKEN_MAP: ${{ secrets.PYPI_TOKEN_MAP }}
           TWINE_USERNAME: __token__
-          TWINE_REGISTRY: ${{ github.event.inputs.pypi_registry }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-          NPM_REGISTRY: ${{ github.event.inputs.npm_registry }}
         uses: jupyter-server/jupyter_releaser/.github/actions/publish-release@v1
         with:
           token: ${{ secrets.ADMIN_GITHUB_TOKEN }}

jupyter_releaser/cli.py

@@ -567,11 +567,27 @@ def extract_release(auth, dist_dir, dry_run, release_url, npm_install_options):
     envvar="TWINE_COMMAND",
     default="twine upload",
 )
+@click.option(
+    "--npm-registry",
+    help="The npm registry to target for publishing",
+    envvar="NPM_REGISTRY",
+    default="https://registry.npmjs.org/",
+)
+@click.option(
+    "--twine-registry",
+    help="The pypi register to target for publishing",
+    envvar="TWINE_REGISTRY",
+    default="https://pypi.org/simple/",
+)
 @add_options(dry_run_options)
 @use_checkout_dir()
-def publish_assets(dist_dir, npm_token, npm_cmd, twine_cmd, dry_run):
+def publish_assets(
+    dist_dir, npm_token, npm_cmd, twine_cmd, npm_registry, twine_registry, dry_run
+):
     """Publish release asset(s)"""
-    lib.publish_assets(dist_dir, npm_token, npm_cmd, twine_cmd, dry_run)
+    lib.publish_assets(
+        dist_dir, npm_token, npm_cmd, twine_cmd, npm_registry, twine_registry, dry_run
+    )
 
 
 @main.command()

jupyter_releaser/lib.py

@@ -372,8 +372,13 @@ def parse_release_url(release_url):
     return match
 
 
-def publish_assets(dist_dir, npm_token, npm_cmd, twine_cmd, dry_run):
+def publish_assets(
+    dist_dir, npm_token, npm_cmd, twine_cmd, npm_registry, twine_registry, dry_run
+):
     """Publish release asset(s)"""
+    os.environ["NPM_REGISTRY"] = npm_registry
+    os.environ["TWINE_REGISTRY"] = twine_registry
+
     if dry_run:
         # Start local pypi server with no auth, allowing overwrites,
         # in a temporary directory

jupyter_releaser/tests/test_cli.py

@@ -157,6 +157,7 @@ def test_list_envvars(runner):
 links-expire: RH_LINKS_EXPIRE
 npm-cmd: RH_NPM_COMMAND
 npm-install-options: RH_NPM_INSTALL_OPTIONS
+npm-registry: NPM_REGISTRY
 npm-token: NPM_TOKEN
 output: RH_CHANGELOG_OUTPUT
 post-version-message: RH_POST_VERSION_MESSAGE
@@ -170,6 +171,7 @@ def test_list_envvars(runner):
 tag-format: RH_TAG_FORMAT
 tag-message: RH_TAG_MESSAGE
 twine-cmd: TWINE_COMMAND
+twine-registry: TWINE_REGISTRY
 username: GITHUB_ACTOR
 version-cmd: RH_VERSION_COMMAND
 version-spec: RH_VERSION_SPEC