mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-04-06 13:50:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

More renaming

Browse Source
This commit is contained in:
Jeremy Tuloup 2022-01-18 16:43:12 +01:00
parent 78f745573c
commit 8b6c8209ad
67 changed files with 201 additions and 465 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.bumpversion.cfg
View File

@ -3,12 +3,12 @@ current_version = 0, 4, 0, 'alpha', 1
commit = False
tag = False
parse = (?P<major>\d+)\,\ (?P<minor>\d+)\,\ (?P<patch>\d+)\,\ \'(?P<release>\S+)\'\,\ (?P<build>\d+)
serialize =
serialize =
{major}, {minor}, {patch}, '{release}', {build}
[bumpversion:part:release]
optional_value = final
values =
values =
alpha
beta
candidate
@ -16,4 +16,4 @@ values =
[bumpversion:part:build]
[bumpversion:file:retrolab/_version.py]
[bumpversion:file:notebook/_version.py]

8
.github/actions/build-dist/action.yml vendored
View File

@ -1,5 +1,5 @@
name: "Build RetroLab"
description: "Build RetroLab fron source"
name: "Build Jupyter Notebook"
description: "Build Jupyter Notebook from source"
runs:
using: "composite"
steps:
@ -34,11 +34,11 @@ runs:
- name: Upload distributions
uses: actions/upload-artifact@v2
with:
name: retrolab-dist-${{ github.run_number }}
name: notebook-dist-${{ github.run_number }}
path: ./dist
- name: Upload distributions
uses: actions/upload-artifact@v2
with:
name: retrolab-pkgs-${{ github.run_number }}
name: notebook-pkgs-${{ github.run_number }}
path: ./pkgs

10
.github/workflows/build.yml vendored
View File

@ -46,7 +46,7 @@ jobs:
run: |
python -m pip install .
jupyter labextension list 2>&1 | grep -ie "@jupyter-notebook/lab-extension.*enabled.*ok" -
jupyter server extension list 2>&1 | grep -ie "retrolab.*enabled" -
jupyter server extension list 2>&1 | grep -ie "notebook.*enabled" -
python -m jupyterlab.browser_check
- name: Lint
@ -70,9 +70,9 @@ jobs:
python: ['3.7', '3.10']
include:
- python: '3.7'
dist: 'retrolab*.tar.gz'
dist: 'notebook*.tar.gz'
- python: '3.10'
dist: 'retrolab*.whl'
dist: 'notebook*.whl'
- os: windows
py_cmd: python
- os: macos
@ -87,7 +87,7 @@ jobs:
architecture: 'x64'
- uses: actions/download-artifact@v2
with:
name: retrolab-dist-${{ github.run_number }}
name: notebook-dist-${{ github.run_number }}
path: ./dist
- name: Install the prerequisites
run: |
@ -105,6 +105,6 @@ jobs:
jupyter labextension list
jupyter labextension list 2>&1 | grep -ie "@jupyter-notebook/lab-extension.*enabled.*ok" -
jupyter server extension list
jupyter server extension list 2>&1 | grep -ie "retrolab.*enabled" -
jupyter server extension list 2>&1 | grep -ie "notebook.*enabled" -
jupyter retro --version
jupyter retro --help

2
.github/workflows/buildutils.yml vendored
View File

@ -35,7 +35,7 @@ jobs:
run: |
# TODO: improve this with a mock package?
# This step is to ensure the workflow always starts with a final version
sed -i -E "s/VersionInfo\(.*\)/VersionInfo\(9, 8, 7, 'final', 0\)/" retrolab/_version.py
sed -i -E "s/VersionInfo\(.*\)/VersionInfo\(9, 8, 7, 'final', 0\)/" notebook/_version.py
sed -i -E "s/current_version = .*/current_version = 9, 8, 7, 'final', 0/" .bumpversion.cfg
jlpm run lerna version 9.8.7 --no-push --force-publish --no-git-tag-version --yes
git commit -am "Release 9.8.7"

14
.github/workflows/ui-tests.yml vendored
View File

@ -33,7 +33,7 @@ jobs:
- uses: actions/download-artifact@v2
with:
name: retrolab-dist-${{ github.run_number }}
name: notebook-dist-${{ github.run_number }}
path: ./dist
- name: Install the prerequisites
@ -43,7 +43,7 @@ jobs:
- name: Install the package
run: |
cd dist
python -m pip install -vv retrolab*.whl
python -m pip install -vv notebook*.whl
- name: Install the test dependencies
run: |
@ -51,12 +51,12 @@ jobs:
jlpm --frozen-lockfile
jlpm playwright install
- name: Start RetroLab
- name: Start Jupyter Notebook
run: |
cd ui-tests
jlpm start:detached
- name: Wait for RetroLab
- name: Wait for Jupyter Notebook
uses: ifaxity/wait-on-action@v1
with:
resource: http-get://127.0.0.1:8888/
@ -71,7 +71,7 @@ jobs:
if: always()
uses: actions/upload-artifact@v2
with:
name: retrolab-${{ matrix.browser }}-test-assets
name: notebook-${{ matrix.browser }}-test-assets
path: |
ui-tests/test-results
@ -79,7 +79,7 @@ jobs:
if: always()
uses: actions/upload-artifact@v2
with:
name: retrolab-${{ matrix.browser }}-test-report
name: notebook-${{ matrix.browser }}-test-report
path: |
ui-tests/playwright-report
@ -96,5 +96,5 @@ jobs:
if: failure()
uses: actions/upload-artifact@v2
with:
name: retrolab-${{ matrix.browser }}-updated-snapshots
name: notebook-${{ matrix.browser }}-updated-snapshots
path: ui-tests/test

8
.gitignore vendored
View File

@ -113,10 +113,10 @@ dmypy.json
_temp_extension
junit.xml
[uU]ntitled*
retrolab/static/*
!retrolab/static/favicons
retrolab/labextension
retrolab/schemas
notebook/static/*
!notebook/static/favicons
notebook/labextension
notebook/schemas
# playwright
ui-tests/test-results

28
CONTRIBUTING.md
View File

@ -1,6 +1,6 @@
# Contributing to RetroLab
# Contributing to Jupyter Notebook
Thanks for contributing to RetroLab!
Thanks for contributing to Jupyter Notebook!
Make sure to follow [Project Jupyter's Code of Conduct](https://github.com/jupyter/governance/blob/master/conduct/code_of_conduct.md)
for a friendly and welcoming collaborative environment.
@ -16,22 +16,22 @@ The `jlpm` command is JupyterLab's pinned version of [yarn](https://yarnpkg.com/
```bash
# create a new environment
mamba create -n retrolab -c conda-forge python nodejs -y
mamba create -n notebook -c conda-forge python nodejs -y
# activate the environment
conda activate retrolab
conda activate notebook
# Install package in development mode
pip install -e .
# Link the RetroLab JupyterLab extension and RetroLab schemas
# Link the notebook extension and @jupyter-notebook schemas
jlpm develop
# Enable the server extension
jupyter server extension enable retrolab
jupyter server extension enable notebook
```
`retrolab` follows a monorepo structure. To build all the packages at once:
`notebook` follows a monorepo structure. To build all the packages at once:
```bash
jlpm build
@ -43,27 +43,27 @@ There is also a `watch` script to watch for changes and rebuild the app automati
jlpm watch
```
To make sure the `retrolab` server extension is installed:
To make sure the `notebook` server extension is installed:
```bash
$ jupyter server extension list
Config dir: /home/username/.jupyter
Config dir: /home/username/miniforge3/envs/retrolab/etc/jupyter
Config dir: /home/username/miniforge3/envs/notebook/etc/jupyter
jupyterlab enabled
- Validating jupyterlab...
jupyterlab 3.0.0 OK
retrolab enabled
- Validating retrolab...
retrolab 0.1.0rc2 OK
notebook enabled
- Validating notebook...
notebook 7.0.0a0 OK
Config dir: /usr/local/etc/jupyter
```
Then start RetroLab with:
Then start Jupyter Notebook with:
```bash
jupyter retro
jupyter notebook
```
## Running Tests

8
MANIFEST.in
View File

@ -2,15 +2,15 @@ include LICENSE
include *.md
include pyproject.toml
include setup.py
include jupyter-config/retrolab.json
include jupyter-config/notebook.json
include package.json
include install.json
include ts*.json
graft retrolab/labextension
graft retrolab/static
graft retrolab/templates
graft notebook/labextension
graft notebook/static
graft notebook/templates
# Javascript files
graft src

14
README.md
View File

@ -1,14 +1,6 @@
<h1 align="center">
<img
alt="RetroLab"
src="./logo.png"
width="256"
/>
</h1>
![Github Actions Status](https://github.com/jupyterlab/retrolab/workflows/Build/badge.svg)
![Github Actions Status](https://github.com/jupyter/notebook/workflows/Build/badge.svg)
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gist/jtpio/4a6a34da66b32249e28df718ec30e4d7/master?urlpath=/retro/notebooks/tour.ipynb)
[![Binder main](https://img.shields.io/badge/launch-main-E66581.svg?logo=data:image/png;base64,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)](https://mybinder.org/v2/gh/jupyterlab/retrolab/main?urlpath=retro/tree)
[![Binder main](https://img.shields.io/badge/launch-main-E66581.svg?logo=data:image/png;base64,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)](https://mybinder.org/v2/gh/jupyter/notebook/main?urlpath=retro/tree)
[![PyPI](https://img.shields.io/pypi/v/retrolab.svg)](https://pypi.org/project/retrolab)
[![conda-forge](https://img.shields.io/conda/vn/conda-forge/retrolab.svg)](https://anaconda.org/conda-forge/retrolab)
@ -35,7 +27,7 @@ anything:
- A tour of the current release:
[![Binder Tour](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gist/jtpio/4a6a34da66b32249e28df718ec30e4d7/master?urlpath=/retro/notebooks/tour.ipynb)
- The current state of this development repository:
[![Binder Main](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/jupyterlab/retrolab/main?urlpath=retro/tree)
[![Binder Main](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/jupyter/notebook/main?urlpath=retro/tree)
## Install

68
RELEASE.md
View File

@ -1,4 +1,4 @@
# Releasing RetroLab
# Releasing Jupyter Notebook
## Automated releases
@ -7,69 +7,3 @@ The recommended way to make a release is to use [`jupyter_releaser`](https://git
We follow a similar bump strategy as in JupyterLab: https://github.com/jupyterlab/jupyterlab/blob/master/RELEASE.md#bump-version
If you would still like to do the release manually instead, read below.
## Making a manual new release of RetroLab
This process is still a bit manual and consists of running a couple of commands.
## Getting a clean environment
Creating a new environment can help avoid pushing local changes and any extra tag.
```bash
mamba create -q -y -n retrolab-release -c conda-forge twine nodejs jupyter-packaging jupyterlab -y
conda activate retrolab-release
```
Alternatively, the local repository can be cleaned with:
```bash
git clean -fdx
```
## Releasing on PyPI
Make sure the `dist/` folder is empty.
1. Update [retrolab/\_version.py](./retrolab/_version.py) with the new version number
2. Commit the changes
- `git add retrolab/_version.py`
- `git commit -m "Release x.y.z"`
3. Bump the frontend packages:
- `jlpm`
- `jlpm run lerna version x.y.z --no-push --amend --force-publish`
4. Run: `python -m pip install build && python -m build`
5. Double check the size of the bundles in the `dist/` folder
6. Test the release by installing the wheel or sdist: `python -m pip install ./dist/retrolab-x.y.z-py3-none-any.whl
7. `export TWINE_USERNAME=mypypi_username`
8. `twine upload dist/*`
## Releasing on conda-forge
The simplest is to wait for the bot to automatically open the PR.
Alternatively, to do the update manually:
1. Open a new PR on https://github.com/conda-forge/retrolab-feedstock to update the `version` and the `sha256` hash
2. Wait for the tests
3. Merge the PR
The new version will be available on `conda-forge` soon after.
## Publish the packages to npm
1. Publish the packages: `jlpm run lerna publish from-package`
## Committing and tagging
Push the release commit to the `main` branch:
```bash
git push origin main
```
Then create a new release from the GitHub interface.

4
app/index.js
View File

@ -319,8 +319,8 @@ async function main() {
console.error(reason);
});
const RetroApp = require('@jupyter-notebook/application').RetroApp;
const app = new RetroApp({ mimeExtensions });
const NotebookApp = require('@jupyter-notebook/application').NotebookApp;
const app = new NotebookApp({ mimeExtensions });
app.registerPluginModules(mods);

4
app/package.json
View File

@ -6,7 +6,7 @@
"build": "webpack",
"build:prod": "webpack --mode=production",
"clean": "rimraf build && jlpm run clean:static",
"clean:static": "rimraf -g \"../retrolab/static/!(favicons)\"",
"clean:static": "rimraf -g \"../notebook/static/!(favicons)\"",
"prepublishOnly": "yarn run build",
"watch": "webpack --config ./webpack.config.watch.js"
},
@ -156,7 +156,7 @@
"whatwg-fetch": "^3.0.0"
},
"jupyterlab": {
"name": "RetroLab",
"name": "Jupyter Notebook",
"extensions": [
"@jupyter-notebook/application-extension",
"@jupyter-notebook/console-extension",

4
app/webpack.config.js
View File

@ -38,7 +38,7 @@ fs.copySync(cssImports, path.resolve(buildDir, 'extraStyle.js'));
const extras = Build.ensureAssets({
packageNames: names,
output: buildDir,
schemaOutput: path.resolve(__dirname, '..', 'retrolab')
schemaOutput: path.resolve(__dirname, '..', 'notebook')
});
/**
@ -159,7 +159,7 @@ module.exports = [
mode: 'development',
entry: ['./publicpath.js', './' + path.relative(__dirname, entryPoint)],
output: {
path: path.resolve(__dirname, '..', 'retrolab/static/'),
path: path.resolve(__dirname, '..', 'notebook/static/'),
library: {
type: 'var',
name: ['_JUPYTERLAB', 'CORE_OUTPUT']

2
binder/environment.yml
View File

@ -1,4 +1,4 @@
name: retrolab
name: notebook
channels:
- conda-forge
dependencies:

2
binder/example.ipynb
View File

@ -311,7 +311,7 @@
"\n",
"Hope you enjoyed the tour. If you have more question or any other issues, don't hesitate to go to the repository on GitHub!\n",
"\n",
"https://github.com/jupyterlab/retrolab"
"https://github.com/jupyter/notebook"
]
}
],

3
binder/postBuild
View File

@ -4,5 +4,4 @@ set -euo pipefail
python -m pip install -e .
jlpm && jlpm run build
jlpm run develop
jupyter server extension enable retrolab
jupyter serverextension enable retrolab
jupyter serverextension enable notebook

6
buildutils/package.json
View File

@ -3,13 +3,13 @@
"version": "0.4.0-alpha.1",
"private": true,
"description": "Jupyter Notebook - Build Utilities",
"homepage": "https://github.com/jupyterlab/retrolab",
"homepage": "https://github.com/jupyter/notebook",
"bugs": {
"url": "https://github.com/jupyterlab/retrolab/issues"
"url": "https://github.com/jupyter/notebook/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/jupyterlab/retrolab.git"
"url": "https://github.com/jupyter/notebook.git"
},
"license": "BSD-3-Clause",
"author": "Project Jupyter",

6
buildutils/src/develop.ts
View File

@ -15,8 +15,8 @@ import { run } from '@jupyterlab/buildutils';
commander
.description('Setup the repository for develop mode')
.option('--overwrite', 'Force linking the RetroLab schemas')
.option('--source', 'The path to the retrolab package')
.option('--overwrite', 'Force linking the notebook schemas')
.option('--source', 'The path to the notebook package')
.action((options: any) => {
const { overwrite } = options;
const prefix = run(
@ -29,7 +29,7 @@ commander
const source = path.resolve(options.source ?? process.cwd());
const sourceDir = path.join(
source,
'retrolab',
'notebook',
'schemas',
'@jupyter-notebook'
);

2
buildutils/src/utils.ts
View File

@ -1,7 +1,7 @@
import { run } from '@jupyterlab/buildutils';
/**
* Get the current version of RetroLab
* Get the current version of notebook
*/
export function getPythonVersion(): string {
const cmd = 'python setup.py --version';

2
jupyter-config/jupyter_server_config.d/retrolab.json
View File

@ -1,7 +1,7 @@
{
"ServerApp": {
"jpserver_extensions": {
"retrolab": true
"notebook": true
}
}
}

2
jupyter_config.json
View File

@ -1,4 +1,4 @@
{
"RetroApp": { "collaborative": true, "expose_app_in_browser": true },
"NotebookApp": { "collaborative": true, "expose_app_in_browser": true },
"LabApp": { "collaborative": true, "expose_app_in_browser": true }
}

BIN
logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 22 KiB

189
logo.svg
View File

@ -1,189 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="2048"
height="2048"
viewBox="0 0 541.86664 541.86664"
version="1.1"
id="svg319"
inkscape:version="1.0.2 (1.0.2+r75+1)"
sodipodi:docname="logo.svg"
inkscape:export-xdpi="24.000002"
inkscape:export-ydpi="24.000002">
<defs
id="defs313">
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4992"
id="linearGradient11104-2"
gradientUnits="userSpaceOnUse"
x1="-276.77515"
y1="181.02182"
x2="-276.77515"
y2="208.4868"
gradientTransform="matrix(2.3946699,0,0,2.3946699,444.53851,-117.45212)" />
<linearGradient
inkscape:collect="always"
id="linearGradient4992">
<stop
style="stop-color:#faf327;stop-opacity:1"
offset="0"
id="stop4988" />
<stop
style="stop-color:#fa2c8d;stop-opacity:1"
offset="1"
id="stop4990" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4992"
id="linearGradient22598"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(8.1220011,0,0,8.1220011,2145.002,-4828.808)"
x1="-143.43352"
y1="645.45728"
x2="-143.43352"
y2="751.20312" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient19205"
id="linearGradient22600"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(18.88122,-401.28647)"
x1="-33.991322"
y1="344.72861"
x2="-25.952034"
y2="362.60028" />
<linearGradient
inkscape:collect="always"
id="linearGradient19205">
<stop
style="stop-color:#ff9955;stop-opacity:1"
offset="0"
id="stop19201" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop19203" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient19205"
id="linearGradient22602"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.49643156,0,0,0.49643156,-126.97876,-208.55879)"
x1="-33.991322"
y1="344.72861"
x2="-25.952034"
y2="362.60028" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient19205"
id="linearGradient22604"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.64522564,0,0,0.64522564,-113.30702,-194.34482)"
x1="-33.991322"
y1="344.72861"
x2="-25.952034"
y2="362.60028" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.35"
inkscape:cx="800.99538"
inkscape:cy="1222.6708"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
inkscape:document-rotation="0"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:window-width="2048"
inkscape:window-height="1128"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
units="px" />
<metadata
id="metadata316">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(436.78015,15.801637)">
<g
id="g526"
transform="translate(0,44.18345)">
<g
id="g20249-3-3"
transform="matrix(2.1489458,0,0,2.1489458,4.8812138,178.19814)"
style="stroke-width:0.739316">
<path
id="path4608-8-6-9"
style="mix-blend-mode:normal;fill:url(#linearGradient22598);fill-opacity:1;stroke:none;stroke-width:3.00235;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="M 995.89258 373.20117 A 434.86336 434.86336 0 0 0 561.0293 808.06445 A 434.86336 434.86336 0 0 0 561.50977 828.48633 L 1430.2754 828.48633 A 434.86336 434.86336 0 0 0 1430.7559 808.06445 A 434.86336 434.86336 0 0 0 995.89258 373.20117 z M 569.38672 892.90625 A 434.86336 434.86336 0 0 0 578.19336 929.0293 L 1413.5918 929.0293 A 434.86336 434.86336 0 0 0 1422.3984 892.90625 L 569.38672 892.90625 z M 602.52734 993.44922 A 434.86336 434.86336 0 0 0 620.32617 1027.2773 L 1371.459 1027.2773 A 434.86336 434.86336 0 0 0 1389.2598 993.44922 L 602.52734 993.44922 z M 648.51172 1069.6543 A 434.86336 434.86336 0 0 0 674.72852 1101.248 L 1317.0586 1101.248 A 434.86336 434.86336 0 0 0 1343.2773 1069.6543 L 648.51172 1069.6543 z M 717.91211 1142.4746 A 434.86336 434.86336 0 0 0 752.45508 1168.4004 L 1239.332 1168.4004 A 434.86336 434.86336 0 0 0 1273.877 1142.4746 L 717.91211 1142.4746 z M 842.85742 1215.1074 A 434.86336 434.86336 0 0 0 995.89258 1242.9277 A 434.86336 434.86336 0 0 0 1148.9355 1215.1074 L 842.85742 1215.1074 z "
transform="matrix(0.12312239,0,0,0.12312239,-205.52466,-110.83724)" />
<g
id="g1000">
<g
id="g5254-4-1-4"
style="mix-blend-mode:normal;fill:#ffffff;stroke-width:0.739316"
transform="translate(58.57305,-701.24771)" />
</g>
<circle
style="mix-blend-mode:normal;fill:url(#linearGradient22600);fill-opacity:1;stroke:none;stroke-width:0.739316;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="circle21057-1-4-4-9"
cx="-17.47628"
cy="-50.398323"
r="11.615452" />
<circle
style="mix-blend-mode:normal;fill:url(#linearGradient22602);fill-opacity:1;stroke:none;stroke-width:0.36702;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="circle19287-4-7-0"
cx="-145.02777"
cy="-34.366829"
r="5.7662768" />
<circle
style="mix-blend-mode:normal;fill:url(#linearGradient22604);fill-opacity:1;stroke:none;stroke-width:0.477026;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="circle19291-4-8-8"
cx="-136.76582"
cy="32.057243"
r="7.4945874" />
</g>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:100;font-stretch:normal;font-size:89.8398px;line-height:1.25;font-family:Overpass;-inkscape-font-specification:'Overpass Thin';letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient11104-2);fill-opacity:1;stroke:none;stroke-width:0.285801"
x="-430.27777"
y="381.86655"
id="text6471-7-96"><tspan
sodipodi:role="line"
id="tspan6469-9-3"
style="font-style:italic;font-variant:normal;font-weight:800;font-stretch:normal;font-family:'JetBrains Mono';-inkscape-font-specification:'JetBrains Mono Ultra-Bold Italic';fill:url(#linearGradient11104-2);fill-opacity:1;stroke-width:0.285801"
x="-430.27777"
y="381.86655">RETROLAB</tspan></text>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 7.7 KiB

6
retrolab/__init__.py → notebook/__init__.py
View File

@ -5,14 +5,14 @@ from .serverextension import load_jupyter_server_extension
def _jupyter_server_extension_paths():
return [
{
'module': 'retrolab'
'module': 'notebook'
}
]
def _jupyter_server_extension_points():
from .app import RetroApp
return [{"module": "retrolab", "app": RetroApp}]
from .app import NotebookApp
return [{"module": "notebook", "app": NotebookApp}]
def _jupyter_labextension_paths():

2
retrolab/__main__.py → notebook/__main__.py
View File

@ -1,5 +1,5 @@
import sys
from retrolab.app import main
from notebook.app import main
sys.exit(main())

0
retrolab/_version.py → notebook/_version.py
View File

12
retrolab/app.py → notebook/app.py
View File

@ -168,10 +168,10 @@ class RetroNotebookHandler(RetroHandler):
aliases = dict(base_aliases)
class RetroApp(LabServerApp):
class NotebookApp(LabServerApp):
name = "retro"
app_name = "RetroLab"
description = "RetroLab - A JupyterLab Distribution with a retro look and feel"
app_name = "Jupyter Notebook"
description = "Jupyter Notebook - A web-based notebook environment for interactive computing"
version = version
app_version = version
extension_url = "/retro"
@ -198,11 +198,11 @@ class RetroApp(LabServerApp):
flags = flags
flags['expose-app-in-browser'] = (
{'RetroApp': {'expose_app_in_browser': True}},
{'NotebookApp': {'expose_app_in_browser': True}},
"Expose the global app instance to browser via window.jupyterlab."
)
flags["collaborative"] = (
{"RetroApp": {"collaborative": True}},
{"NotebookApp": {"collaborative": True}},
"Whether to enable collaborative mode.",
)
@ -237,7 +237,7 @@ class RetroApp(LabServerApp):
super().initialize()
main = launch_new_instance = RetroApp.launch_instance
main = launch_new_instance = NotebookApp.launch_instance
if __name__ == "__main__":
main()

4
retrolab/serverextension.py → notebook/serverextension.py
View File

@ -1,6 +1,6 @@
def load_jupyter_server_extension(serverapp):
from .app import RetroApp
extension = RetroApp()
from .app import NotebookApp
extension = NotebookApp()
extension.serverapp = serverapp
extension.load_config_file()
extension.update_config(serverapp.config)

0
retrolab/static/favicons/favicon-console.ico → notebook/static/favicons/favicon-console.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
retrolab/templates/consoles.html → notebook/templates/consoles.html
View File

0
retrolab/templates/edit.html → notebook/templates/edit.html
View File

0
retrolab/templates/error.html → notebook/templates/error.html
View File

0
retrolab/templates/notebooks.html → notebook/templates/notebooks.html
View File

0
retrolab/templates/terminals.html → notebook/templates/terminals.html
View File

0
retrolab/templates/tree.html → notebook/templates/tree.html
View File

6
package.json
View File

@ -2,13 +2,13 @@
"name": "@jupyter-notebook/root",
"version": "0.1.0",
"private": true,
"homepage": "https://github.com/jupyterlab/retrolab",
"homepage": "https://github.com/jupyter/notebook",
"bugs": {
"url": "https://github.com/jupyterlab/retrolab/issues"
"url": "https://github.com/jupyter/notebook/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/jupyterlab/retrolab"
"url": "https://github.com/jupyter/notebook"
},
"license": "BSD-3-Clause",
"author": "Project Jupyter",

8
packages/_metapackage/package.json
View File

@ -2,14 +2,14 @@
"name": "@jupyter-notebook/metapackage",
"private": true,
"version": "0.4.0-alpha.1",
"description": "RetroLab - Metapackage",
"homepage": "https://github.com/jupyterlab/retrolab",
"description": "Jupyter Notebook - Metapackage",
"homepage": "https://github.com/jupyter/notebook",
"bugs": {
"url": "https://github.com/jupyterlab/retrolab/issues"
"url": "https://github.com/jupyter/notebook/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/jupyterlab/retrolab.git"
"url": "https://github.com/jupyter/notebook.git"
},
"license": "BSD-3-Clause",
"author": "Project Jupyter",

6
packages/application-extension/package.json
View File

@ -2,13 +2,13 @@
"name": "@jupyter-notebook/application-extension",
"version": "0.4.0-alpha.1",
"description": "Jupyter Notebook - Application Extension",
"homepage": "https://github.com/jupyterlab/retrolab",
"homepage": "https://github.com/jupyter/notebook",
"bugs": {
"url": "https://github.com/jupyterlab/retrolab/issues"
"url": "https://github.com/jupyter/notebook/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/jupyterlab/retrolab.git"
"url": "https://github.com/jupyter/notebook.git"
},
"license": "BSD-3-Clause",
"author": "Project Jupyter",

4
packages/application-extension/schema/menus.json
View File

@ -1,6 +1,6 @@
{
"title": "RetroLab Menu Entries",
"description": "RetroLab Menu Entries",
"title": "Jupyter Notebook Menu Entries",
"description": "Jupyter Notebook Menu Entries",
"jupyter.lab.menus": {
"main": [
{

6
packages/application-extension/schema/top.json
View File

@ -1,8 +1,8 @@
{
"jupyter.lab.setting-icon": "retro-ui-components:retroSun",
"jupyter.lab.setting-icon-label": "RetroLab Top Area",
"title": "RetroLab Top Area",
"description": "RetroLab Top Area settings",
"jupyter.lab.setting-icon-label": "Jupyter Notebook Top Area",
"title": "Jupyter Notebook Top Area",
"description": "Jupyter Notebook Top Area settings",
"properties": {
"visible": {
"type": "boolean",

36
packages/application-extension/src/index.ts
View File

@ -32,8 +32,8 @@ import { ISettingRegistry } from '@jupyterlab/settingregistry';
import { ITranslator } from '@jupyterlab/translation';
import {
RetroApp,
RetroShell,
NotebookApp,
NotebookShell,
INotebookShell
} from '@jupyter-notebook/application';
@ -112,12 +112,12 @@ const dirty: JupyterFrontEndPlugin<void> = {
status: ILabStatus,
translator: ITranslator
): void => {
if (!(app instanceof RetroApp)) {
throw new Error(`${dirty.id} must be activated in RetroLab.`);
if (!(app instanceof NotebookApp)) {
throw new Error(`${dirty.id} must be activated in Jupyter Notebook.`);
}
const trans = translator.load('retrolab');
const trans = translator.load('jupyter-notebook');
const message = trans.__(
'Are you sure you want to exit RetroLab?\n\nAny unsaved changes will be lost.'
'Are you sure you want to exit Jupyter Notebook?\n\nAny unsaved changes will be lost.'
);
window.addEventListener('beforeunload', event => {
@ -245,7 +245,7 @@ const pages: JupyterFrontEndPlugin<void> = {
palette: ICommandPalette | null,
menu: IMainMenu | null
): void => {
const trans = translator.load('retrolab');
const trans = translator.load('jupyter-notebook');
const baseUrl = PageConfig.getBaseUrl();
app.commands.addCommand(CommandIDs.openLab, {
@ -278,15 +278,15 @@ const pages: JupyterFrontEndPlugin<void> = {
};
/**
* The default paths for a RetroLab app.
* The default paths for a Jupyter Notebook app.
*/
const paths: JupyterFrontEndPlugin<JupyterFrontEnd.IPaths> = {
id: '@jupyter-notebook/application-extension:paths',
autoStart: true,
provides: JupyterFrontEnd.IPaths,
activate: (app: JupyterFrontEnd): JupyterFrontEnd.IPaths => {
if (!(app instanceof RetroApp)) {
throw new Error(`${paths.id} must be activated in RetroLab.`);
if (!(app instanceof NotebookApp)) {
throw new Error(`${paths.id} must be activated in Jupyter Notebook.`);
}
return app.paths;
}
@ -328,13 +328,13 @@ const sessionDialogs: JupyterFrontEndPlugin<ISessionContextDialogs> = {
};
/**
* The default RetroLab application shell.
* The default Jupyter Notebook application shell.
*/
const shell: JupyterFrontEndPlugin<INotebookShell> = {
id: '@jupyter-notebook/application-extension:shell',
activate: (app: JupyterFrontEnd) => {
if (!(app.shell instanceof RetroShell)) {
throw new Error(`${shell.id} did not find a RetroShell instance.`);
if (!(app.shell instanceof NotebookShell)) {
throw new Error(`${shell.id} did not find a NotebookShell instance.`);
}
return app.shell;
},
@ -371,8 +371,8 @@ const status: JupyterFrontEndPlugin<ILabStatus> = {
autoStart: true,
provides: ILabStatus,
activate: (app: JupyterFrontEnd) => {
if (!(app instanceof RetroApp)) {
throw new Error(`${status.id} must be activated in RetroLab.`);
if (!(app instanceof NotebookApp)) {
throw new Error(`${status.id} must be activated in Jupyter Notebook.`);
}
return app.status;
}
@ -430,7 +430,7 @@ const title: JupyterFrontEndPlugin<void> = {
router: IRouter | null
) => {
const { commands } = app;
const trans = translator.load('retrolab');
const trans = translator.load('jupyter-notebook');
const widget = new Widget();
widget.id = 'jp-title';
@ -520,7 +520,7 @@ const topVisibility: JupyterFrontEndPlugin<void> = {
menu: IMainMenu | null,
settingRegistry: ISettingRegistry | null
) => {
const trans = translator.load('retrolab');
const trans = translator.load('jupyter-notebook');
const top = retroShell.top;
const pluginId = topVisibility.id;
@ -682,7 +682,7 @@ const zen: JupyterFrontEndPlugin<void> = {
): void => {
const { commands } = app;
const elem = document.documentElement;
const trans = translator.load('retrolab');
const trans = translator.load('jupyter-notebook');
const toggleOn = () => {
retroShell?.collapseTop();

6
packages/application/package.json
View File

@ -2,13 +2,13 @@
"name": "@jupyter-notebook/application",
"version": "0.4.0-alpha.1",
"description": "Jupyter Notebook - Application",
"homepage": "https://github.com/jupyterlab/retrolab",
"homepage": "https://github.com/jupyter/notebook",
"bugs": {
"url": "https://github.com/jupyterlab/retrolab/issues"
"url": "https://github.com/jupyter/notebook/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/jupyterlab/retrolab.git"
"url": "https://github.com/jupyter/notebook.git"
},
"license": "BSD-3-Clause",
"author": "Project Jupyter",

22
packages/application/src/app.ts
View File

@ -16,21 +16,21 @@ import { IRenderMime } from '@jupyterlab/rendermime-interfaces';
import { Throttler } from '@lumino/polling';
import { INotebookShell, RetroShell } from './shell';
import { INotebookShell, NotebookShell } from './shell';
/**
* App is the main application class. It is instantiated once and shared.
*/
export class RetroApp extends JupyterFrontEnd<INotebookShell> {
export class NotebookApp extends JupyterFrontEnd<INotebookShell> {
/**
* Construct a new RetroApp object.
* Construct a new NotebookApp object.
*
* @param options The instantiation options for an application.
*/
constructor(options: RetroApp.IOptions = { shell: new RetroShell() }) {
constructor(options: NotebookApp.IOptions = { shell: new NotebookShell() }) {
super({
...options,
shell: options.shell ?? new RetroShell()
shell: options.shell ?? new NotebookShell()
});
if (options.mimeExtensions) {
for (const plugin of createRendermimePlugins(options.mimeExtensions)) {
@ -43,7 +43,7 @@ export class RetroApp extends JupyterFrontEnd<INotebookShell> {
/**
* The name of the application.
*/
readonly name = 'RetroLab';
readonly name = 'Jupyter Notebook';
/**
* A namespace/prefix plugins may use to denote their provenance.
@ -110,7 +110,7 @@ export class RetroApp extends JupyterFrontEnd<INotebookShell> {
*
* @param mod - The plugin module to register.
*/
registerPluginModule(mod: RetroApp.IPluginModule): void {
registerPluginModule(mod: NotebookApp.IPluginModule): void {
let data = mod.default;
// Handle commonjs exports.
if (!Object.prototype.hasOwnProperty.call(mod, '__esModule')) {
@ -133,7 +133,7 @@ export class RetroApp extends JupyterFrontEnd<INotebookShell> {
*
* @param mods - The plugin modules to register.
*/
registerPluginModules(mods: RetroApp.IPluginModule[]): void {
registerPluginModules(mods: NotebookApp.IPluginModule[]): void {
mods.forEach(mod => {
this.registerPluginModule(mod);
});
@ -147,7 +147,7 @@ export class RetroApp extends JupyterFrontEnd<INotebookShell> {
/**
* A namespace for App statics.
*/
export namespace RetroApp {
export namespace NotebookApp {
/**
* The instantiation options for an App application.
*/
@ -156,7 +156,7 @@ export namespace RetroApp {
Partial<IInfo> {}
/**
* The information about a RetroLab application.
* The information about a Jupyter Notebook application.
*/
export interface IInfo {
/**
@ -191,7 +191,7 @@ namespace Private {
*
* @param app The front-end application whose format is set.
*/
export function setFormat(app: RetroApp): void {
export function setFormat(app: NotebookApp): void {
app.format = window.matchMedia(MOBILE_QUERY).matches ? 'mobile' : 'desktop';
}
}

10
packages/application/src/shell.ts
View File

@ -16,16 +16,16 @@ import { ISignal, Signal } from '@lumino/signaling';
import { Panel, Widget, BoxLayout } from '@lumino/widgets';
/**
* The RetroLab application shell token.
* The Jupyter Notebook application shell token.
*/
export const INotebookShell = new Token<INotebookShell>(
'@jupyter-notebook/application:INotebookShell'
);
/**
* The RetroLab application shell interface.
* The Jupyter Notebook application shell interface.
*/
export interface INotebookShell extends RetroShell {}
export interface INotebookShell extends NotebookShell {}
/**
* The default rank for ranked panels.
@ -35,7 +35,7 @@ const DEFAULT_RANK = 900;
/**
* The application shell.
*/
export class RetroShell extends Widget implements JupyterFrontEnd.IShell {
export class NotebookShell extends Widget implements JupyterFrontEnd.IShell {
constructor() {
super();
this.id = 'main';
@ -78,7 +78,7 @@ export class RetroShell extends Widget implements JupyterFrontEnd.IShell {
/**
* A signal emitted when the current widget changes.
*/
get currentChanged(): ISignal<RetroShell, void> {
get currentChanged(): ISignal<NotebookShell, void> {
return this._currentChanged;
}

6
packages/application/test/shell.spec.ts
View File

@ -1,7 +1,7 @@
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
import { RetroShell, INotebookShell } from '@jupyter-notebook/application';
import { NotebookShell, INotebookShell } from '@jupyter-notebook/application';
import { JupyterFrontEnd } from '@jupyterlab/application';
@ -13,7 +13,7 @@ describe('Shell', () => {
let shell: INotebookShell;
beforeEach(() => {
shell = new RetroShell();
shell = new NotebookShell();
Widget.attach(shell, document.body);
});
@ -23,7 +23,7 @@ describe('Shell', () => {
describe('#constructor()', () => {
it('should create a LabShell instance', () => {
expect(shell).toBeInstanceOf(RetroShell);
expect(shell).toBeInstanceOf(NotebookShell);
});
});

6
packages/console-extension/package.json
View File

@ -2,13 +2,13 @@
"name": "@jupyter-notebook/console-extension",
"version": "0.4.0-alpha.1",
"description": "Jupyter Notebook - Console Extension",
"homepage": "https://github.com/jupyterlab/retrolab",
"homepage": "https://github.com/jupyter/notebook",
"bugs": {
"url": "https://github.com/jupyterlab/retrolab/issues"
"url": "https://github.com/jupyter/notebook/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/jupyterlab/retrolab.git"
"url": "https://github.com/jupyter/notebook.git"
},
"license": "BSD-3-Clause",
"author": "Project Jupyter",

6
packages/docmanager-extension/package.json
View File

@ -2,13 +2,13 @@
"name": "@jupyter-notebook/docmanager-extension",
"version": "0.4.0-alpha.1",
"description": "Jupyter Notebook - Document Manager Extension",
"homepage": "https://github.com/jupyterlab/retrolab",
"homepage": "https://github.com/jupyter/notebook",
"bugs": {
"url": "https://github.com/jupyterlab/retrolab/issues"
"url": "https://github.com/jupyter/notebook/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/jupyterlab/retrolab.git"
"url": "https://github.com/jupyter/notebook.git"
},
"license": "BSD-3-Clause",
"author": "Project Jupyter",

6
packages/documentsearch-extension/package.json
View File

@ -2,13 +2,13 @@
"name": "@jupyter-notebook/documentsearch-extension",
"version": "0.4.0-alpha.1",
"description": "Jupyter Notebook - Document Search Extension",
"homepage": "https://github.com/jupyterlab/retrolab",
"homepage": "https://github.com/jupyter/notebook",
"bugs": {
"url": "https://github.com/jupyterlab/retrolab/issues"
"url": "https://github.com/jupyter/notebook/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/jupyterlab/retrolab.git"
"url": "https://github.com/jupyter/notebook.git"
},
"license": "BSD-3-Clause",
"author": "Project Jupyter",

2
packages/documentsearch-extension/src/index.ts
View File

@ -14,7 +14,7 @@ import { INotebookShell } from '@jupyter-notebook/application';
const SEARCHABLE_CLASS = 'jp-mod-searchable';
/**
* A plugin to programmatically disable the Crtl-F shortcut in RetroLab
* A plugin to programmatically disable the Crtl-F shortcut in Jupyter Notebook
* See https://github.com/jupyterlab/retrolab/pull/294 and
* https://github.com/jupyterlab/jupyterlab/issues/11754 for more context.
*/

6
packages/help-extension/package.json
View File

@ -2,13 +2,13 @@
"name": "@jupyter-notebook/help-extension",
"version": "0.4.0-alpha.1",
"description": "Jupyter Notebook - Help Extension",
"homepage": "https://github.com/jupyterlab/retrolab",
"homepage": "https://github.com/jupyter/notebook",
"bugs": {
"url": "https://github.com/jupyterlab/retrolab/issues"
"url": "https://github.com/jupyter/notebook/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/jupyterlab/retrolab.git"
"url": "https://github.com/jupyter/notebook.git"
},
"license": "BSD-3-Clause",
"author": "Project Jupyter",

6
packages/help-extension/src/index.tsx
View File

@ -55,7 +55,7 @@ const plugin: JupyterFrontEndPlugin<void> = {
menu: IMainMenu | null
): void => {
const { commands } = app;
const trans = translator.load('retrolab');
const trans = translator.load('jupyter-notebook');
commands.addCommand(CommandIDs.open, {
label: args => args['text'] as string,
@ -124,8 +124,8 @@ const plugin: JupyterFrontEndPlugin<void> = {
</>
);
const retroNotebookURL = 'https://github.com/jupyterlab/retrolab';
const linkLabel = trans.__('RETROLAB ON GITHUB');
const retroNotebookURL = 'https://github.com/jupyter/notebook';
const linkLabel = trans.__('JUPYTER NOTEBOOK ON GITHUB');
const externalLinks = (
<span>
<a

10
packages/lab-extension/package.json
View File

@ -2,13 +2,13 @@
"name": "@jupyter-notebook/lab-extension",
"version": "0.4.0-alpha.1",
"description": "Jupyter Notebook - Lab Extension",
"homepage": "https://github.com/jupyterlab/retrolab",
"homepage": "https://github.com/jupyter/notebook",
"bugs": {
"url": "https://github.com/jupyterlab/retrolab/issues"
"url": "https://github.com/jupyter/notebook/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/jupyterlab/retrolab.git"
"url": "https://github.com/jupyter/notebook.git"
},
"license": "BSD-3-Clause",
"author": "Project Jupyter",
@ -36,7 +36,7 @@
"build:lib": "tsc",
"build:prod": "jlpm run build:lib && jlpm run build:labextension",
"clean": "jlpm run clean:lib && jlpm run clean:labextension",
"clean:labextension": "rimraf ../../retrolab/labextension",
"clean:labextension": "rimraf ../../notebook/labextension",
"clean:lib": "rimraf lib tsconfig.tsbuildinfo",
"watch": "run-p watch:src watch:labextension",
"watch:labextension": "jupyter labextension watch .",
@ -64,7 +64,7 @@
},
"jupyterlab": {
"extension": true,
"outputDir": "../../retrolab/labextension",
"outputDir": "../../notebook/labextension",
"schemaDir": "schema"
},
"styleModule": "style/index.js"

28
packages/lab-extension/src/index.ts
View File

@ -26,24 +26,24 @@ import { INotebookShell } from '@jupyter-notebook/application';
*/
namespace CommandIDs {
/**
* Launch RetroLab Tree
* Launch Jupyter Notebook Tree
*/
export const launchRetroTree = 'retrolab:launch-tree';
export const launchRetroTree = 'jupyter-notebook:launch-tree';
/**
* Open RetroLab
* Open Jupyter Notebook
*/
export const openRetro = 'retrolab:open-retro';
export const openRetro = 'jupyter-notebook:open-retro';
/**
* Open in Classic Notebook
*/
export const openClassic = 'retrolab:open-classic';
export const openClassic = 'jupyter-notebook:open-classic';
/**
* Open in JupyterLab
*/
export const openLab = 'retrolab:open-lab';
export const openLab = 'jupyter-notebook:open-lab';
}
interface ISwitcherChoice {
@ -85,7 +85,7 @@ const launchButtons: JupyterFrontEndPlugin<void> = {
const { commands, shell } = app;
const baseUrl = PageConfig.getBaseUrl();
const trans = translator.load('retrolab');
const trans = translator.load('jupyter-notebook');
const menubar = new MenuBar();
const switcher = new Menu({ commands });
switcher.title.label = trans.__('Interface');
@ -126,7 +126,7 @@ const launchButtons: JupyterFrontEndPlugin<void> = {
// always add Classic
addInterface({
command: 'retrolab:open-classic',
command: 'jupyter-notebook:open-classic',
commandLabel: trans.__('Open With %1', 'Classic Notebook'),
buttonLabel: 'openClassic',
urlPrefix: `${baseUrl}tree/`
@ -134,8 +134,8 @@ const launchButtons: JupyterFrontEndPlugin<void> = {
if (!retroShell) {
addInterface({
command: 'retrolab:open-retro',
commandLabel: trans.__('Open With %1', 'RetroLab'),
command: 'jupyter-notebook:open-retro',
commandLabel: trans.__('Open With %1', 'Jupyter Notebook'),
buttonLabel: 'openRetro',
urlPrefix: `${baseUrl}retro/tree/`
});
@ -143,7 +143,7 @@ const launchButtons: JupyterFrontEndPlugin<void> = {
if (!labShell) {
addInterface({
command: 'retrolab:open-lab',
command: 'jupyter-notebook:open-lab',
commandLabel: trans.__('Open With %1', 'JupyterLab'),
buttonLabel: 'openLab',
urlPrefix: `${baseUrl}doc/tree/`
@ -166,7 +166,7 @@ const launchButtons: JupyterFrontEndPlugin<void> = {
};
/**
* A plugin to add a command to open the RetroLab Tree.
* A plugin to add a command to open the Jupyter Notebook Tree.
*/
const launchRetroTree: JupyterFrontEndPlugin<void> = {
id: '@jupyter-notebook/lab-extension:launch-retrotree',
@ -180,11 +180,11 @@ const launchRetroTree: JupyterFrontEndPlugin<void> = {
palette: ICommandPalette | null
): void => {
const { commands } = app;
const trans = translator.load('retrolab');
const trans = translator.load('jupyter-notebook');
const category = trans.__('Help');
commands.addCommand(CommandIDs.launchRetroTree, {
label: trans.__('Launch RetroLab File Browser'),
label: trans.__('Launch Jupyter Notebook File Browser'),
execute: () => {
window.open(PageConfig.getBaseUrl() + 'retro/tree');
}

6
packages/notebook-extension/package.json
View File

@ -2,13 +2,13 @@
"name": "@jupyter-notebook/notebook-extension",
"version": "0.4.0-alpha.1",
"description": "Jupyter Notebook - Notebook Extension",
"homepage": "https://github.com/jupyterlab/retrolab",
"homepage": "https://github.com/jupyter/notebook",
"bugs": {
"url": "https://github.com/jupyterlab/retrolab/issues"
"url": "https://github.com/jupyter/notebook/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/jupyterlab/retrolab.git"
"url": "https://github.com/jupyter/notebook.git"
},
"license": "BSD-3-Clause",
"author": "Project Jupyter",

6
packages/notebook-extension/schema/scroll-output.json
View File

@ -1,8 +1,8 @@
{
"jupyter.lab.setting-icon": "retro-ui-components:retroSun",
"jupyter.lab.setting-icon-label": "RetroLab Notebook",
"title": "RetroLab Notebook",
"description": "RetroLab Notebook settings",
"jupyter.lab.setting-icon-label": "Jupyter Notebook Notebook",
"title": "Jupyter Notebook Notebook",
"description": "Jupyter Notebook Notebook settings",
"properties": {
"autoScrollOutputs": {
"type": "boolean",

4
packages/notebook-extension/src/index.ts
View File

@ -68,7 +68,7 @@ const checkpoints: JupyterFrontEndPlugin<void> = {
retroShell: INotebookShell | null
) => {
const { shell } = app;
const trans = translator.load('retrolab');
const trans = translator.load('jupyter-notebook');
const widget = new Widget();
widget.id = DOMUtils.createDomID();
widget.addClass('jp-RetroCheckpoint');
@ -175,7 +175,7 @@ const kernelStatus: JupyterFrontEndPlugin<void> = {
shell: INotebookShell,
translator: ITranslator
) => {
const trans = translator.load('retrolab');
const trans = translator.load('jupyter-notebook');
const widget = new Widget();
widget.addClass('jp-RetroKernelStatus');
app.shell.add(widget, 'menu', { rank: 10_010 });

6
packages/terminal-extension/package.json
View File

@ -2,13 +2,13 @@
"name": "@jupyter-notebook/terminal-extension",
"version": "0.4.0-alpha.1",
"description": "Jupyter Notebook - Terminal Extension",
"homepage": "https://github.com/jupyterlab/retrolab",
"homepage": "https://github.com/jupyter/notebook",
"bugs": {
"url": "https://github.com/jupyterlab/retrolab/issues"
"url": "https://github.com/jupyter/notebook/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/jupyterlab/retrolab.git"
"url": "https://github.com/jupyter/notebook.git"
},
"license": "BSD-3-Clause",
"author": "Project Jupyter",

6
packages/tree-extension/package.json
View File

@ -2,13 +2,13 @@
"name": "@jupyter-notebook/tree-extension",
"version": "0.4.0-alpha.1",
"description": "Jupyter Notebook - Tree Extension",
"homepage": "https://github.com/jupyterlab/retrolab",
"homepage": "https://github.com/jupyter/notebook",
"bugs": {
"url": "https://github.com/jupyterlab/retrolab/issues"
"url": "https://github.com/jupyter/notebook/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/jupyterlab/retrolab.git"
"url": "https://github.com/jupyter/notebook.git"
},
"license": "BSD-3-Clause",
"author": "Project Jupyter",

8
packages/tree-extension/src/index.ts
View File

@ -37,7 +37,7 @@ const newFiles: JupyterFrontEndPlugin<void> = {
) => {
const { commands } = app;
const browser = filebrowser.defaultBrowser;
const trans = translator.load('retrolab');
const trans = translator.load('jupyter-notebook');
// wrapper commands to be able to override the label
const newNotebookCommand = 'tree:new-notebook';
@ -78,7 +78,7 @@ const newConsole: JupyterFrontEndPlugin<void> = {
) => {
const { commands } = app;
const browser = filebrowser.defaultBrowser;
const trans = translator.load('retrolab');
const trans = translator.load('jupyter-notebook');
const newConsoleCommand = 'tree:new-console';
commands.addCommand(newConsoleCommand, {
@ -112,7 +112,7 @@ const newTerminal: JupyterFrontEndPlugin<void> = {
) => {
const { commands } = app;
const browser = filebrowser.defaultBrowser;
const trans = translator.load('retrolab');
const trans = translator.load('jupyter-notebook');
const newTerminalCommand = 'tree:new-terminal';
commands.addCommand(newTerminalCommand, {
@ -149,7 +149,7 @@ const browserWidget: JupyterFrontEndPlugin<void> = {
const tabPanel = new TabPanel({ tabPlacement: 'top', tabsMovable: true });
tabPanel.addClass('jp-TreePanel');
const trans = translator.load('retrolab');
const trans = translator.load('jupyter-notebook');
const { defaultBrowser: browser } = factory;
browser.title.label = trans.__('Files');

6
packages/ui-components/package.json
View File

@ -2,13 +2,13 @@
"name": "@jupyter-notebook/ui-components",
"version": "0.4.0-alpha.1",
"description": "Jupyter Notebook - UI components",
"homepage": "https://github.com/jupyterlab/retrolab",
"homepage": "https://github.com/jupyter/notebook",
"bugs": {
"url": "https://github.com/jupyterlab/retrolab/issues"
"url": "https://github.com/jupyter/notebook/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/jupyterlab/retrolab.git"
"url": "https://github.com/jupyter/notebook.git"
},
"license": "BSD-3-Clause",
"author": "Project Jupyter",

6
pyproject.toml
View File

@ -6,8 +6,8 @@ build-backend = "jupyter_packaging.build_api"
file="LICENSE"
[tool.jupyter-packaging.options]
skip-if-exists = ["retrolab/labextension/static/style.js", "retrolab/static/bundle.js"]
ensured-targets = ["retrolab/labextension/static/style.js", "retrolab/static/bundle.js"]
skip-if-exists = ["notebook/labextension/static/style.js", "notebook/static/bundle.js"]
ensured-targets = ["notebook/labextension/static/style.js", "notebook/static/bundle.js"]
[tool.jupyter-packaging.builder]
factory = "jupyter_packaging.npm_builder"
@ -17,4 +17,4 @@ build_cmd = "build:prod"
npm = ["jlpm"]
[tool.check-manifest]
ignore = ["app/**", "binder/**", "buildutils/**", "packages/**", "*.json", "yarn.lock", "readthedocs.yml", ".bumpversion.cfg", ".*", "lint-staged.config.js", "logo.*", "retrolab/labextension/**", "retrolab/schemas/**", "retrolab/static/**", "retrolab/template/**", "ui-tests/**"]
ignore = ["app/**", "binder/**", "buildutils/**", "packages/**", "*.json", "yarn.lock", "readthedocs.yml", ".bumpversion.cfg", ".*", "lint-staged.config.js", "logo.*", "notebook/labextension/**", "notebook/schemas/**", "notebook/static/**", "notebook/template/**", "ui-tests/**"]

8
setup.cfg
View File

@ -1,13 +1,13 @@
[metadata]
name = retrolab
version = attr: retrolab._version.__version__
name = notebook
version = attr: notebook._version.__version__
description = JupyterLab Distribution with a retro look and feel
long_description = file: README.md
long_description_content_type = text/markdown
license_file = LICENSE
author = Jupyter Development Team
author_email = jupyter@googlegroups.com
url = https://github.com/jupyterlab/retrolab
url = https://github.com/jupyter/notebook
platforms = Linux, Mac OS X, Windows
keywords = Jupyter, JupyterLab, Notebook
classifiers =
@ -35,4 +35,4 @@ install_requires =
[options.entry_points]
console_scripts =
jupyter-retro = retrolab.app:main
jupyter-notebook = notebook.app:main

6
setup.py
View File

@ -8,7 +8,7 @@ import setuptools
HERE = Path(__file__).parent.resolve()
# The name of the project
NAME = "retrolab"
NAME = "notebook"
labext_name = "@jupyter-notebook/lab-extension"
lab_extension_dest = HERE / NAME / "labextension"
@ -28,12 +28,12 @@ data_files_spec = [
(
"etc/jupyter/jupyter_server_config.d",
"jupyter-config/jupyter_server_config.d",
"retrolab.json",
"notebook.json",
),
(
"etc/jupyter/jupyter_notebook_config.d",
"jupyter-config/jupyter_notebook_config.d",
"retrolab.json",
"notebook.json",
),
]

2
ui-tests/package.json
View File

@ -4,7 +4,7 @@
"version": "0.1.0",
"author": "Project Jupyter",
"license": "BSD-3-Clause",
"description": "RetroLab UI Tests",
"description": "Jupyter Notebook UI Tests",
"scripts": {
"start": "jupyter retro --config test/jupyter_server_config.py",
"start:detached": "yarn run start&",

2
ui-tests/test/jupyter_server_config.py
View File

@ -8,4 +8,4 @@ c.ServerApp.root_dir = mkdtemp(prefix="galata-test-")
c.ServerApp.token = ""
c.ServerApp.password = ""
c.ServerApp.disable_check_xsrf = True
c.RetroApp.expose_app_in_browser = True
c.NotebookApp.expose_app_in_browser = True

2
ui-tests/test/mobile.spec.ts
View File

@ -30,7 +30,7 @@ test.describe('Mobile', () => {
`${tmpPath}/${notebook}`
);
await page.goto(`notebooks/${tmpPath}/${notebook}`);
// TODO: investigate why this does not run the cells in RetroLab
// TODO: investigate why this does not run the cells in Jupyter Notebook
// await page.notebook.run();
// wait for the kernel status animations to be finished

2
ui-tests/test/notebook.spec.ts
View File

@ -59,7 +59,7 @@ test.describe('Notebook', () => {
});
// TODO: rewrite with page.notebook when fixed upstream in Galata
// and usable in RetroLab without active tabs
// and usable in Jupyter Notebook without active tabs
test('Outputs should be scrolled automatically', async ({
page,
tmpPath