Skip to content

Commit

Permalink
Release commit created with Cranko.
Browse files Browse the repository at this point in the history
+++ cranko-release-info-v1
[[projects]]
qnames = ["pywwt", "npm"]
version = "1.3.1"
age = 0

[[projects]]
qnames = ["pywwt", "pypa"]
version = "0.13.1"
age = 0

+++
  • Loading branch information
cranko committed Oct 14, 2021
2 parents 8f282f5 + 29756c4 commit c87a485
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 6 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# pypa:pywwt 0.13.1 (2021-10-14)

- Update the Jupyter(Lab) frontend code to fix a dumb bug that broke the widget
when the "baseUrl" was non-trivial (#314, @pkgw).


# pypa:pywwt 0.13.0 (2021-09-24)

This is an important release, updating all variations of the pywwt UI ­— the Qt
Expand Down
7 changes: 7 additions & 0 deletions frontend/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# npm:pywwt 1.3.1 (2021-10-14)

- Fix a dumb string-processing bug in the URL canonicalization code that broke
the widget in Jupyter environments where the "base URL" is nontrivial (#314,
@pkgw).


# npm:pywwt 1.3.0 (2021-09-24)

- Bundle the research app in the pywwt distribution; currently requiring version
Expand Down
8 changes: 6 additions & 2 deletions frontend/lib/widget.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,12 @@ var WWTModel = widgets.DOMWidgetModel.extend({
// servers and the like. The Python kernel code can determine the base
// URL on its own, but it requires some super hackery (reading various
// magical JSON config files and making API calls).
if (url.slice(4) == '/wwt') {
url = this.wwtBaseUrl + url;
if (url.slice(0, 4) == '/wwt') {
if (this.wwtBaseUrl.slice(-1) == '/') {
url = this.wwtBaseUrl.slice(0, -1) + url;
} else {
url = this.wwtBaseUrl + url;
}
}

return new URL(url, location.toString()).toString();
Expand Down
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@
"clean": "shx rm -rf dist",
"pywwt-export": "npm run build && npm pack && node pywwt-export.js"
},
"version": "1.3.0"
"version": "1.3.1"
}
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ annotated_files = [
]

[tool.cranko.internal_dep_versions]
"npm:pywwt" = "thiscommit:29e64671926d2fce87bbcad78d54980a"
"npm:pywwt" = "thiscommit:2021-10-14:Zfo8YcB"
2 changes: 1 addition & 1 deletion pywwt/_version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version_info = (0, 13, 0, 'final', 0) # cranko project-version tuple
version_info = (0, 13, 1, 'final', 0) # cranko project-version tuple

_specifier_ = {'alpha': '.a', 'beta': '.b', 'candidate': '.rc', 'final': '', 'dev': '.dev'}

Expand Down
2 changes: 1 addition & 1 deletion pywwt/jupyter.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

__all__ = ['WWTJupyterWidget', 'WWTLabApplication', 'connect_to_app']

_npm_version = '^1.0.0' # cranko internal-req npm:pywwt
_npm_version = '^1.3.1' # cranko internal-req npm:pywwt
VIEW_MODULE_VERSION = _npm_version
MODEL_MODULE_VERSION = _npm_version

Expand Down

0 comments on commit c87a485

Please sign in to comment.