From d54f5eb048ebec3fa0b225740ee9c4283b82acd1 Mon Sep 17 00:00:00 2001 From: Erik Sundell Date: Tue, 3 Jan 2023 10:34:47 +0100 Subject: [PATCH] Rename jupyterlab-server-proxy folder to labextension --- .github/workflows/publish.yaml | 8 ++++---- .github/workflows/test.yaml | 2 +- CONTRIBUTING.md | 4 ++-- MANIFEST.in | 4 ++-- RELEASE.md | 4 ++-- {jupyterlab-server-proxy => labextension}/.gitignore | 0 {jupyterlab-server-proxy => labextension}/.yarnrc | 0 {jupyterlab-server-proxy => labextension}/LICENSE | 0 {jupyterlab-server-proxy => labextension}/README.md | 0 {jupyterlab-server-proxy => labextension}/package.json | 0 {jupyterlab-server-proxy => labextension}/src/index.ts | 0 {jupyterlab-server-proxy => labextension}/tsconfig.json | 0 {jupyterlab-server-proxy => labextension}/yarn.lock | 0 pyproject.toml | 2 +- setup.py | 4 ++-- 15 files changed, 14 insertions(+), 14 deletions(-) rename {jupyterlab-server-proxy => labextension}/.gitignore (100%) rename {jupyterlab-server-proxy => labextension}/.yarnrc (100%) rename {jupyterlab-server-proxy => labextension}/LICENSE (100%) rename {jupyterlab-server-proxy => labextension}/README.md (100%) rename {jupyterlab-server-proxy => labextension}/package.json (100%) rename {jupyterlab-server-proxy => labextension}/src/index.ts (100%) rename {jupyterlab-server-proxy => labextension}/tsconfig.json (100%) rename {jupyterlab-server-proxy => labextension}/yarn.lock (100%) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 69588690..9d915c09 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -53,8 +53,8 @@ jobs: - name: Javascript package run: | mkdir jsdist - cd jupyterlab-server-proxy - jlpm pack --filename ../jsdist/jupyterlab-server-proxy-jlpmpack.tgz + cd labextension + jlpm pack --filename ../jsdist/labextension-jlpmpack.tgz - name: Upload Python artifact uses: actions/upload-artifact@v3 @@ -112,9 +112,9 @@ jobs: name: jsdist path: jsdist - - run: npm publish --dry-run ./jsdist/jupyterlab-server-proxy-jlpmpack.tgz + - run: npm publish --dry-run ./jsdist/labextension-jlpmpack.tgz - - run: npm publish ./jsdist/jupyterlab-server-proxy-jlpmpack.tgz + - run: npm publish ./jsdist/labextension-jlpmpack.tgz if: startsWith(github.ref, 'refs/tags') env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 81ad625d..5758124f 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -98,7 +98,7 @@ jobs: - name: Install JupyterLab Extension if: matrix.jupyterlab-version == '2' run: | - cd jupyterlab-server-proxy + cd labextension jupyter labextension install . --no-build --debug jupyter lab build --minimize=False --debug diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 224f888f..8b019aaa 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -66,10 +66,10 @@ installed with JupyterLab. > You may use `yarn` or `npm run` instead of `jlpm` below. ```bash -cd jupyterlab-server-proxy # Change to the root of the labextension +cd labextension # Change to the root of the labextension jlpm # Install dependencies (or `npm i`) jlpm build:prod # Build: - # - `jupyterlab-server-proxy/lib` + # - `labextension/lib` # - `jupyter_server_proxy/labextension` jlpm install:extension # Symlink into `{sys.prefix}/share/jupyter/labextensions` ``` diff --git a/MANIFEST.in b/MANIFEST.in index 157ab5d6..421dec69 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,3 @@ include LICENSE -recursive-include jupyterlab-server-proxy * -prune jupyterlab-server-proxy/node_modules +recursive-include labextension * +prune labextension/node_modules diff --git a/RELEASE.md b/RELEASE.md index 86a2ecbe..d578061f 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -10,7 +10,7 @@ These are instructions on how to make a release. ## Steps to make a release -1. Create a PR updating `jupyterlab-server-proxy/yarl.lock` and continue only +1. Create a PR updating `labextension/yarl.lock` and continue only when its merged. This helps us avoid leaving known vulnerabilities are unfixed. To do this, @@ -18,7 +18,7 @@ These are instructions on how to make a release. `.github/workflows/publish.yaml` workflow's `build` job as summarized below. ```shell - rm jupyterlab-server-proxy/yarn.lock + rm labextension/yarn.lock pip install jupyter_packaging wheel jupyterlab~=3.0 python setup.py sdist bdist_wheel diff --git a/jupyterlab-server-proxy/.gitignore b/labextension/.gitignore similarity index 100% rename from jupyterlab-server-proxy/.gitignore rename to labextension/.gitignore diff --git a/jupyterlab-server-proxy/.yarnrc b/labextension/.yarnrc similarity index 100% rename from jupyterlab-server-proxy/.yarnrc rename to labextension/.yarnrc diff --git a/jupyterlab-server-proxy/LICENSE b/labextension/LICENSE similarity index 100% rename from jupyterlab-server-proxy/LICENSE rename to labextension/LICENSE diff --git a/jupyterlab-server-proxy/README.md b/labextension/README.md similarity index 100% rename from jupyterlab-server-proxy/README.md rename to labextension/README.md diff --git a/jupyterlab-server-proxy/package.json b/labextension/package.json similarity index 100% rename from jupyterlab-server-proxy/package.json rename to labextension/package.json diff --git a/jupyterlab-server-proxy/src/index.ts b/labextension/src/index.ts similarity index 100% rename from jupyterlab-server-proxy/src/index.ts rename to labextension/src/index.ts diff --git a/jupyterlab-server-proxy/tsconfig.json b/labextension/tsconfig.json similarity index 100% rename from jupyterlab-server-proxy/tsconfig.json rename to labextension/tsconfig.json diff --git a/jupyterlab-server-proxy/yarn.lock b/labextension/yarn.lock similarity index 100% rename from jupyterlab-server-proxy/yarn.lock rename to labextension/yarn.lock diff --git a/pyproject.toml b/pyproject.toml index 37133547..6394cd86 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,4 +32,4 @@ message_template = "Bump to {new_version}" tag_template = "v{new_version}" [[tool.tbump.file]] -src = "jupyterlab-server-proxy/package.json" +src = "labextension/package.json" diff --git a/setup.py b/setup.py index ff609db1..38eda7ff 100644 --- a/setup.py +++ b/setup.py @@ -57,7 +57,7 @@ ) js_command = combine_commands( - install_npm(HERE / "jupyterlab-server-proxy", build_cmd="build:prod", npm=["jlpm"]), + install_npm(HERE / "labextension", build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) @@ -70,7 +70,7 @@ long_description = (HERE / "README.md").read_text() # Get the package info from package.json -pkg_json = json.loads((HERE / "jupyterlab-server-proxy" / "package.json").read_bytes()) +pkg_json = json.loads((HERE / "labextension" / "package.json").read_bytes()) setup_args = dict( name=name.replace("_", "-"),