Skip to content

Commit 55d4a9f

Browse files
authored
Merge pull request #427 from consideRatio/pr/pyproject.toml-metadata
Declare metadata in pyproject.toml, remove hatch-nodejs-version plugin
2 parents 0c57b27 + 1234bab commit 55d4a9f

File tree

3 files changed

+24
-16
lines changed

3 files changed

+24
-16
lines changed

jupyter_server_proxy/__init__.py

Lines changed: 1 addition & 0 deletions
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

Lines changed: 4 additions & 0 deletions
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"

pyproject.toml

Lines changed: 19 additions & 16 deletions
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,12 +16,13 @@ requires = [
1716
#
1817
[project]
1918
name = "jupyter_server_proxy"
20-
dynamic = [
21-
"authors",
22-
"description",
23-
"keywords",
24-
"urls",
25-
"version",
19+
version = "4.1.1-0.dev"
20+
description = "A Jupyter server extension to run additional processes and proxy to them that comes bundled JupyterLab extension to launch pre-defined processes."
21+
keywords = ["jupyter", "jupyterlab", "jupyterlab-extension"]
22+
authors = [
23+
{ name = "Ryan Lovett", email = "[email protected]" },
24+
{ name = "Yuvi Panda", email = "[email protected]" },
25+
{ name = "Jupyter Development Team", email = "[email protected]" },
2626
]
2727
readme = "README.md"
2828
license = { file = "LICENSE" }
@@ -75,10 +75,14 @@ lab = [
7575
"notebook >=7",
7676
]
7777

78-
[tool.hatch.version]
79-
source = "nodejs"
80-
path = "labextension/package.json"
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"
8182

83+
84+
# hatch ref: https://hatch.pypa.io/latest/
85+
#
8286
[tool.hatch.build.targets.sdist]
8387
artifacts = [
8488
"jupyter_server_proxy/labextension",
@@ -101,10 +105,6 @@ exclude = [
101105
# Set to true to allow testing of git+https://github.com/user/repo@sha dependencies
102106
allow-direct-references = false
103107

104-
[tool.hatch.metadata.hooks.nodejs]
105-
path = "labextension/package.json"
106-
fields = ["description", "authors", "urls"]
107-
108108
[tool.hatch.build.hooks.jupyter-builder]
109109
build-function = "hatch_jupyter_builder.npm_builder"
110110
ensured-targets = [
@@ -187,6 +187,9 @@ regex = '''
187187
message_template = "Bump to {new_version}"
188188
tag_template = "v{new_version}"
189189

190+
[[tool.tbump.file]]
191+
src = "pyproject.toml"
192+
190193
[[tool.tbump.file]]
191194
src = "labextension/package.json"
192195

0 commit comments

Comments
 (0)