Skip to content

Commit 64b554b

Browse files
committed
Fix server extension name and outputDir
1 parent 620bca8 commit 64b554b

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ node_modules/
3939
*.egg-info/
4040
.ipynb_checkpoints
4141
*.tsbuildinfo
42-
jupyter-resource-usage/labextension
42+
jupyter_resource_usage/labextension
4343
yarn-error.log

packages/labextension/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"build:lib": "tsc",
3333
"clean": "jlpm run clean:lib",
3434
"clean:lib": "rimraf lib tsconfig.tsbuildinfo",
35-
"clean:labextension": "rimraf ../../jupyter-resource-usage/labextension",
35+
"clean:labextension": "rimraf ../../jupyter_resource_usage/labextension",
3636
"clean:all": "jlpm run clean:lib && jlpm run clean:labextension",
3737
"eslint": "eslint . --ext .ts,.tsx --fix",
3838
"eslint:check": "eslint . --ext .ts,.tsx",
@@ -72,6 +72,6 @@
7272
],
7373
"jupyterlab": {
7474
"extension": true,
75-
"outputDir": "../../jupyter-resource-usage/labextension"
75+
"outputDir": "../../jupyter_resource_usage/labextension"
7676
}
7777
}

setup.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,19 @@
1212
HERE = os.path.abspath(os.path.dirname(__file__))
1313

1414
# The name of the project
15-
name = "jupyter-resource-usage"
15+
NAME = "jupyter-resource-usage"
16+
PACKAGE_NAME = NAME.replace("-", "_")
1617

1718
src_path = os.path.join(HERE, "packages", "labextension")
18-
lab_path = os.path.join(HERE, name, "labextension")
19+
lab_path = os.path.join(HERE, PACKAGE_NAME, "labextension")
1920

2021
# Representative files that should exist after a successful build
2122
jstargets = [
2223
os.path.join(src_path, "lib", "index.js"),
2324
os.path.join(lab_path, "package.json"),
2425
]
2526

26-
package_data_spec = {name: ["*"]}
27+
package_data_spec = {PACKAGE_NAME: ["*"]}
2728

2829
labext_name = "@jupyter-server/resource-usage"
2930

@@ -45,7 +46,7 @@
4546
long_description = fh.read()
4647

4748
setuptools.setup(
48-
name=name,
49+
name=NAME,
4950
version="0.4.0",
5051
url="https://github.com/jupyter-server/jupyter-resource-usage",
5152
author="Jupyter Development Team",
@@ -61,15 +62,15 @@
6162
data_files=[
6263
(
6364
"share/jupyter/nbextensions/jupyter-resource-usage",
64-
glob("jupyter-resource-usage/static/*"),
65+
glob("jupyter_resource_usage/static/*"),
6566
),
6667
(
6768
"etc/jupyter/jupyter_notebook_config.d",
68-
["jupyter-resource-usage/etc/serverextension.json"],
69+
["jupyter_resource_usage/etc/serverextension.json"],
6970
),
7071
(
7172
"etc/jupyter/nbconfig/notebook.d",
72-
["jupyter-resource-usage/etc/nbextension.json"],
73+
["jupyter_resource_usage/etc/nbextension.json"],
7374
),
7475
],
7576
zip_safe=False,

0 commit comments

Comments
 (0)