Skip to content

Commit

Permalink
Rename jupyterlab-server-proxy folder to labextension
Browse files Browse the repository at this point in the history
  • Loading branch information
consideRatio committed Jan 3, 2023
1 parent 65f13b5 commit d54f5eb
Show file tree
Hide file tree
Showing 15 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
```
Expand Down
4 changes: 2 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
include LICENSE
recursive-include jupyterlab-server-proxy *
prune jupyterlab-server-proxy/node_modules
recursive-include labextension *
prune labextension/node_modules
4 changes: 2 additions & 2 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ 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,
delete the file and manually perform the the `build dist` step in the
`.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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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),
)

Expand All @@ -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("_", "-"),
Expand Down

0 comments on commit d54f5eb

Please sign in to comment.