Skip to content

Commit 56b4425

Browse files
committed
Revert "Rename package from catppuccin_jupyterlab to catppuccin-jupyterlab"
This reverts commit 39e83f9.
1 parent 2d58c86 commit 56b4425

File tree

11 files changed

+31
-31
lines changed

11 files changed

+31
-31
lines changed

.copier-answers.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ file_extension: ''
88
has_binder: false
99
has_settings: false
1010
kind: theme
11-
labextension_name: catppuccin-jupyterlab
11+
labextension_name: catppuccin_jupyterlab
1212
mimetype: ''
1313
mimetype_name: ''
1414
project_short_description: 📊 Soothing pastel theme for JupyterLab.
15-
python_name: catppuccin-jupyterlab
15+
python_name: catppuccin_jupyterlab
1616
repository: https://github.com/gabrielmagno/jupyterlab
1717
test: false
1818
viewer_name: ''

.github/workflows/build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
python -m pip install .[test]
3333
3434
jupyter labextension list
35-
jupyter labextension list 2>&1 | grep -ie "catppuccin-jupyterlab.*OK"
35+
jupyter labextension list 2>&1 | grep -ie "catppuccin_jupyterlab.*OK"
3636
python -m jupyterlab.browser_check
3737
3838
- name: Package the extension
@@ -41,7 +41,7 @@ jobs:
4141
4242
pip install build
4343
python -m build
44-
pip uninstall -y "catppuccin-jupyterlab" jupyterlab
44+
pip uninstall -y "catppuccin_jupyterlab" jupyterlab
4545
4646
- name: Upload extension packages
4747
uses: actions/upload-artifact@v3
@@ -74,7 +74,7 @@ jobs:
7474
7575
7676
jupyter labextension list
77-
jupyter labextension list 2>&1 | grep -ie "catppuccin-jupyterlab.*OK"
77+
jupyter labextension list 2>&1 | grep -ie "catppuccin_jupyterlab.*OK"
7878
python -m jupyterlab.browser_check --no-browser-test
7979
8080

.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ node_modules/
77
*.egg-info/
88
.ipynb_checkpoints
99
*.tsbuildinfo
10-
catppuccin-jupyterlab/labextension
10+
catppuccin_jupyterlab/labextension
1111
# Version file is handled by hatchling
12-
catppuccin-jupyterlab/_version.py
12+
catppuccin_jupyterlab/_version.py
1313

1414
# Created by https://www.gitignore.io/api/python
1515
# Edit at https://www.gitignore.io/?templates=python

.prettierignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ node_modules
33
**/lib
44
**/package.json
55
!/package.json
6-
catppuccin-jupyterlab
6+
catppuccin_jupyterlab
77
examples
88
README.md

RELEASE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Making a new release of catppuccin-jupyterlab
1+
# Making a new release of catppuccin_jupyterlab
22

33
The extension can be published to `PyPI` and `npm` manually or using the [Jupyter Releaser](https://github.com/jupyter-server/jupyter_releaser).
44

catppuccin-jupyterlab/__init__.py renamed to catppuccin_jupyterlab/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
# in editable mode with pip. It is highly recommended to install
66
# the package from a stable release or in editable mode: https://pip.pypa.io/en/stable/topics/local-project-installs/#editable-installs
77
import warnings
8-
warnings.warn("Importing 'catppuccin-jupyterlab' outside a proper installation.")
8+
warnings.warn("Importing 'catppuccin_jupyterlab' outside a proper installation.")
99
__version__ = "dev"
1010

1111

1212
def _jupyter_labextension_paths():
1313
return [{
1414
"src": "labextension",
15-
"dest": "catppuccin-jupyterlab"
15+
"dest": "catppuccin_jupyterlab"
1616
}]

install.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"packageManager": "python",
3-
"packageName": "catppuccin-jupyterlab",
4-
"uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package catppuccin-jupyterlab"
3+
"packageName": "catppuccin_jupyterlab",
4+
"uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package catppuccin_jupyterlab"
55
}

package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "catppuccin-jupyterlab",
3-
"version": "0.1.3",
2+
"name": "catppuccin_jupyterlab",
3+
"version": "0.1.2",
44
"description": "📊 Soothing pastel theme for JupyterLab.",
55
"keywords": [
66
"jupyter",
@@ -37,7 +37,7 @@
3737
"clean": "jlpm clean:lib",
3838
"clean:lib": "rimraf lib tsconfig.tsbuildinfo",
3939
"clean:lintcache": "rimraf .eslintcache .stylelintcache",
40-
"clean:labextension": "rimraf catppuccin-jupyterlab/labextension catppuccin-jupyterlab/_version.py",
40+
"clean:labextension": "rimraf catppuccin_jupyterlab/labextension catppuccin_jupyterlab/_version.py",
4141
"clean:all": "jlpm clean:lib && jlpm clean:labextension && jlpm clean:lintcache",
4242
"eslint": "jlpm eslint:check --fix",
4343
"eslint:check": "eslint . --cache --ext .ts,.tsx",
@@ -90,7 +90,7 @@
9090
},
9191
"jupyterlab": {
9292
"extension": true,
93-
"outputDir": "catppuccin-jupyterlab/labextension",
93+
"outputDir": "catppuccin_jupyterlab/labextension",
9494
"schemaDir": "schema",
9595
"themePath": "style/index.css"
9696
},

pyproject.toml

+7-7
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,23 @@ source = "nodejs"
3232
fields = ["description", "authors", "urls"]
3333

3434
[tool.hatch.build.targets.sdist]
35-
artifacts = ["catppuccin-jupyterlab/labextension"]
35+
artifacts = ["catppuccin_jupyterlab/labextension"]
3636
exclude = [".github", "binder"]
3737

3838
[tool.hatch.build.targets.wheel.shared-data]
39-
"catppuccin-jupyterlab/labextension" = "share/jupyter/labextensions/catppuccin-jupyterlab"
40-
"install.json" = "share/jupyter/labextensions/catppuccin-jupyterlab/install.json"
39+
"catppuccin_jupyterlab/labextension" = "share/jupyter/labextensions/catppuccin_jupyterlab"
40+
"install.json" = "share/jupyter/labextensions/catppuccin_jupyterlab/install.json"
4141

4242
[tool.hatch.build.hooks.version]
43-
path = "catppuccin-jupyterlab/_version.py"
43+
path = "catppuccin_jupyterlab/_version.py"
4444

4545
[tool.hatch.build.hooks.jupyter-builder]
4646
dependencies = ["hatch-jupyter-builder>=0.5"]
4747
build-function = "hatch_jupyter_builder.npm_builder"
4848
ensured-targets = [
49-
"catppuccin-jupyterlab/labextension/package.json",
49+
"catppuccin_jupyterlab/labextension/package.json",
5050
]
51-
skip-if-exists = ["catppuccin-jupyterlab/labextension/static/style.js"]
51+
skip-if-exists = ["catppuccin_jupyterlab/labextension/static/style.js"]
5252

5353
[tool.hatch.build.hooks.jupyter-builder.build-kwargs]
5454
build_cmd = "build:prod"
@@ -58,7 +58,7 @@ npm = ["jlpm"]
5858
build_cmd = "install:extension"
5959
npm = ["jlpm"]
6060
source_dir = "src"
61-
build_dir = "catppuccin-jupyterlab/labextension"
61+
build_dir = "catppuccin_jupyterlab/labextension"
6262

6363
[tool.jupyter-releaser.options]
6464
version_cmd = "hatch version"

src/index.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import { ISettingRegistry } from '@jupyterlab/settingregistry';
1010
import { CatppuccinPalettes } from './palettes';
1111

1212
/**
13-
* Initialization data for the catppuccin-jupyterlab extension.
13+
* Initialization data for the catppuccin_jupyterlab extension.
1414
*/
1515
const plugin: JupyterFrontEndPlugin<void> = {
16-
id: 'catppuccin-jupyterlab:plugin',
16+
id: 'catppuccin_jupyterlab:plugin',
1717
description: '📊 Soothing pastel theme for JupyterLab.',
1818
autoStart: true,
1919
requires: [IThemeManager],
@@ -23,7 +23,7 @@ const plugin: JupyterFrontEndPlugin<void> = {
2323
manager: IThemeManager,
2424
settingRegistry: ISettingRegistry | null
2525
) => {
26-
const style = 'catppuccin-jupyterlab/index.css';
26+
const style = 'catppuccin_jupyterlab/index.css';
2727
const palettes = new CatppuccinPalettes();
2828

2929
let brandColor = 'mauve';
@@ -37,12 +37,12 @@ const plugin: JupyterFrontEndPlugin<void> = {
3737
brandColor = settings.get('brandColor').composite as string;
3838
accentColor = settings.get('accentColor').composite as string;
3939
console.debug(
40-
`catppuccin-jupyterlab settings loaded. Brand color is '${brandColor}', Accent color is '${accentColor}'`
40+
`catppuccin_jupyterlab settings loaded. Brand color is '${brandColor}', Accent color is '${accentColor}'`
4141
);
4242
})
4343
.catch(reason => {
4444
console.error(
45-
'Failed to load settings for catppuccin-jupyterlab.',
45+
'Failed to load settings for catppuccin_jupyterlab.',
4646
reason
4747
);
4848
});

yarn.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -1553,9 +1553,9 @@ __metadata:
15531553
languageName: node
15541554
linkType: hard
15551555

1556-
"catppuccin-jupyterlab@workspace:.":
1556+
"catppuccin_jupyterlab@workspace:.":
15571557
version: 0.0.0-use.local
1558-
resolution: "catppuccin-jupyterlab@workspace:."
1558+
resolution: "catppuccin_jupyterlab@workspace:."
15591559
dependencies:
15601560
"@jupyterlab/application": ^3.0.0 || ^4.0.0
15611561
"@jupyterlab/apputils": ^3.0.0 || ^4.0.0

0 commit comments

Comments
 (0)