Skip to content

Commit 3e4e01a

Browse files
committed
Declare metadata in pyproject.toml, remove hatch-nodejs-version plugin
1 parent e3c2b4d commit 3e4e01a

File tree

4 files changed

+23
-32
lines changed

4 files changed

+23
-32
lines changed

jupyter_server_proxy/__init__.py

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from jupyter_server.utils import url_path_join as ujoin
22

3+
from ._version import __version__ # noqa
34
from .api import IconHandler, ServersInfoHandler
45
from .config import ServerProxy as ServerProxyConfig
56
from .config import get_entrypoint_server_processes, make_handlers, make_server_process

jupyter_server_proxy/_version.py

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# __version__ should be updated using tbump, based on configuration in
2+
# pyproject.toml, according to instructions in RELEASE.md.
3+
#
4+
__version__ = "4.1.1-0.dev"

labextension/package.json

-17
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,14 @@
11
{
22
"name": "@jupyterhub/jupyter-server-proxy",
33
"version": "4.1.1-0.dev",
4-
"description": "A JupyterLab extension accompanying the PyPI package jupyter-server-proxy adding launcher items for configured server processes.",
5-
"keywords": [
6-
"jupyter",
7-
"jupyterlab",
8-
"jupyterlab-extension"
9-
],
104
"homepage": "https://github.com/jupyterhub/jupyter-server-proxy",
11-
"bugs": {
12-
"url": "https://github.com/jupyterhub/jupyter-server-proxy/issues"
13-
},
145
"license": "BSD-3-Clause",
15-
"author": {
16-
"name": "Ryan Lovett & Yuvi Panda",
17-
"email": "[email protected]"
18-
},
196
"files": [
207
"LICENSE",
218
"lib/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,ttf}"
229
],
2310
"main": "lib/index.js",
2411
"types": "lib/index.d.ts",
25-
"repository": {
26-
"type": "git",
27-
"url": "https://github.com/jupyterhub/jupyter-server-proxy.git"
28-
},
2912
"scripts": {
3013
"build": "jlpm run build:lib && jlpm run build:labextension:dev",
3114
"build:prod": "jlpm clean && jlpm run build:lib && jlpm run build:labextension",

pyproject.toml

+18-15
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
[build-system]
55
build-backend = "hatchling.build"
66
requires = [
7-
"hatch-jupyter-builder >=0.5",
8-
"hatch-nodejs-version",
9-
"hatchling >=1.4.0",
7+
"hatch-jupyter-builder >=0.8.3",
8+
"hatchling >=1.18.0",
109
"jupyterlab >=4.0.6,<5.0.0a0",
1110
]
1211

@@ -17,13 +16,14 @@ requires = [
1716
#
1817
[project]
1918
name = "jupyter_server_proxy"
20-
dynamic = [
21-
"authors",
22-
"description",
23-
"keywords",
24-
"urls",
25-
"version",
19+
description = "A JupyterLab extension accompanying the PyPI package jupyter-server-proxy adding launcher items for configured server processes."
20+
keywords = ["jupyter", "jupyterlab", "jupyterlab-extension"]
21+
authors = [
22+
{ name = "Ryan Lovett", email = "[email protected]" },
23+
{ name = "Yuvi Panda", email = "[email protected]" },
24+
{ name = "Jupyter Development Team", email = "[email protected]" },
2625
]
26+
dynamic = ["version"]
2727
readme = "README.md"
2828
license = { file = "LICENSE" }
2929
requires-python = ">=3.8"
@@ -75,9 +75,16 @@ lab = [
7575
"notebook >=7",
7676
]
7777

78+
[project.urls]
79+
Documentation = "https://jupyter-server-proxy.readthedocs.io"
80+
Source = "https://github.com/jupyterhub/jupyter-server-proxy"
81+
Tracker = "https://github.com/jupyterhub/jupyter-server-proxy/issues"
82+
83+
84+
# hatch ref: https://hatch.pypa.io/latest/
85+
#
7886
[tool.hatch.version]
79-
source = "nodejs"
80-
path = "labextension/package.json"
87+
path = "jupyter_server_proxy/_version.py"
8188

8289
[tool.hatch.build.targets.sdist]
8390
artifacts = [
@@ -101,10 +108,6 @@ exclude = [
101108
# Set to true to allow testing of git+https://github.com/user/repo@sha dependencies
102109
allow-direct-references = false
103110

104-
[tool.hatch.metadata.hooks.nodejs]
105-
path = "labextension/package.json"
106-
fields = ["description", "authors", "urls"]
107-
108111
[tool.hatch.build.hooks.jupyter-builder]
109112
build-function = "hatch_jupyter_builder.npm_builder"
110113
ensured-targets = [

0 commit comments

Comments
 (0)