Skip to content

Commit

Permalink
Merge branch 'main' of github.com:huntdatacenter/jupyter-tigervnc-nov…
Browse files Browse the repository at this point in the history
…nc-proxy
  • Loading branch information
JakubNTNU committed Nov 10, 2023
2 parents 9c67945 + d49be49 commit b283eb8
Show file tree
Hide file tree
Showing 130 changed files with 8 additions and 10 deletions.
6 changes: 2 additions & 4 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
include README.md
include requirements.txt

include src/jupyter_novnc_proxy/vnc.sh
graft src/workbench_app_proxy/novnc
graft /src/jupyter_novnc_proxy/novnc

include src/jupyter_tigervnc_novnc_proxy/vnc.sh
graft src/jupyter_tigervnc_novnc_proxy/novnc

global-exclude *.py[cod]
global-exclude __pycache__
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ requires = ["hatchling"]
build-backend = "hatchling.build"

[project]
name = "jupyter-novnc-proxy"
name = "jupyter-tigervnc-novnc-proxy"
version = "0.0.1"
authors = [
{ name="Matus Kosut", email="matus.kosut@ntnu.no" },
Expand Down Expand Up @@ -42,11 +42,11 @@ keywords = [
dev = ["black", "ruamel.yaml", "pytest", "pytest-cov"]

[project.entry-points.jupyter_serverproxy_servers]
novnc = "jupyter_novnc_proxy:run_app"
novnc = "jupyter_tigervnc_novnc_proxy:run_app"


[tool.hatch.build.targets.wheel]
packages = ["src/jupyter_novnc_proxy"]
packages = ["src/jupyter_tigervnc_novnc_proxy"]

[tool.hatch.build]
sources = ["src"]
Expand All @@ -58,4 +58,4 @@ artifacts = [
artifacts = []
exclude = [".github", "setup", "Makefile", "docker-compose.yml"]

[tool.hatch.build.targets.jupyter_novnc_proxy]
[tool.hatch.build.targets.jupyter_tigervnc_novnc_proxy]
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ def run_app():

log.info("Initializing Jupyter Workbench Proxy")

import jupyter_novnc_proxy
pkgdir = os.path.dirname(jupyter_novnc_proxy.__file__)
import jupyter_tigervnc_novnc_proxy
pkgdir = os.path.dirname(jupyter_tigervnc_novnc_proxy.__file__)
novnc_dir = os.path.join(pkgdir, "novnc")
novnc_proxy = os.path.join(novnc_dir, "utils", "novnc_proxy")
executable_name = os.path.join(pkgdir, "vnc.sh")
Expand Down
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit b283eb8

Please sign in to comment.