diff --git a/CHANGELOG.md b/CHANGELOG.md index 0463b1ba..779b02d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# pypa:pywwt 0.19.1 (2023-05-26) + +- Use version 0.14.2 of the research app in the bundled widget frontend, to get + a fix for HiPS catalogs loaded in HTTPS contexts (#352, @pkgw). + + # pypa:pywwt 0.19.0 (2023-03-08) - Allow the roll angle of the WWT camera to be both read and written (#349, diff --git a/ci/azure-build-and-test.yml b/ci/azure-build-and-test.yml index c6a1dac7..22ee6c67 100644 --- a/ci/azure-build-and-test.yml +++ b/ci/azure-build-and-test.yml @@ -6,48 +6,34 @@ parameters: default: - name: linux_37 - vmImage: ubuntu-20.04 + vmImage: ubuntu-22.04 vars: PYTHON_SERIES: "3.7" - name: linux_38 - vmImage: ubuntu-20.04 + vmImage: ubuntu-22.04 vars: PYTHON_SERIES: "3.8" - name: linux_39 - vmImage: ubuntu-20.04 + vmImage: ubuntu-22.04 vars: PYTHON_SERIES: "3.9" - - name: macos_37 - vmImage: macos-11 - vars: - PYTHON_SERIES: "3.7" - - - name: macos_38 - vmImage: macos-11 + - name: macos_39 + vmImage: macos-12 vars: - PYTHON_SERIES: "3.8" + PYTHON_SERIES: "3.9" - - name: windows_37 - vmImage: windows-2019 + - name: macos_310 + vmImage: macos-12 vars: - PYTHON_SERIES: "3.7" + PYTHON_SERIES: "3.10" - - name: windows_39 - vmImage: windows-2019 + - name: windows_310 + vmImage: windows-2022 vars: - PYTHON_SERIES: "3.9" - - # 2020 Oct: the Windows / Python 3.8 build seems to hang forever in the test - # suite. No clues as to why, and the package complement is virtually identical - # to what's used for 3.7. Just skip the test for now. - # - #- name: windows_38 - # vmImage: windows-2019 - # vars: - # PYTHON_SERIES: "3.8" + PYTHON_SERIES: "3.10" jobs: - ${{ each build in parameters.builds }}: @@ -163,7 +149,7 @@ jobs: source activate-conda.sh conda activate build set -x - \conda install -y jupyterlab + \conda install -y jupyterlab jupyter_contrib_nbextensions jupyter nbextension list jupyter serverextension list jupyter labextension list diff --git a/ci/azure-deployment.yml b/ci/azure-deployment.yml index 56c337ca..23725ba3 100644 --- a/ci/azure-deployment.yml +++ b/ci/azure-deployment.yml @@ -15,14 +15,14 @@ jobs: - ${{ if parameters.isMainDev }}: - job: dummy_setup_only pool: - vmImage: ubuntu-20.04 + vmImage: ubuntu-latest steps: - template: azure-job-setup.yml - ${{ if parameters.isRelease }}: - job: branch_and_tag pool: - vmImage: ubuntu-20.04 + vmImage: ubuntu-latest variables: - group: Deployment Credentials steps: @@ -47,7 +47,7 @@ jobs: - job: github_releases dependsOn: branch_and_tag # otherwise, GitHub creates the tag itself pool: - vmImage: ubuntu-20.04 + vmImage: ubuntu-latest variables: - group: Deployment Credentials steps: @@ -64,7 +64,7 @@ jobs: - job: python_publish pool: - vmImage: ubuntu-20.04 + vmImage: ubuntu-latest variables: - group: Deployment Credentials steps: @@ -91,7 +91,7 @@ jobs: - job: npm_publish pool: - vmImage: ubuntu-20.04 + vmImage: ubuntu-latest variables: - group: Deployment Credentials steps: @@ -113,7 +113,7 @@ jobs: - job: zenodo_publish pool: - vmImage: ubuntu-20.04 + vmImage: ubuntu-latest variables: - group: Deployment Credentials diff --git a/ci/azure-job-setup.yml b/ci/azure-job-setup.yml index f7f1bedf..d195b23f 100644 --- a/ci/azure-job-setup.yml +++ b/ci/azure-job-setup.yml @@ -100,6 +100,8 @@ steps: set -euo pipefail source activate-conda.sh set -x + # workaround for the Windows CI image: + conda install -y brotlipy conda config --add channels conda-forge conda config --set channel_priority strict conda update -y --all diff --git a/ci/azure-sdist.yml b/ci/azure-sdist.yml index 1fc0f08c..115edd82 100644 --- a/ci/azure-sdist.yml +++ b/ci/azure-sdist.yml @@ -4,7 +4,7 @@ jobs: - job: sdist pool: - vmImage: ubuntu-20.04 + vmImage: ubuntu-latest # Need Zenodo credentials to generate DOIs during formal releases. But make # sure not to provide credentials otherwise (although Azure has its own checks diff --git a/ci/zenodo.json5 b/ci/zenodo.json5 index 7de52af8..ef38385a 100644 --- a/ci/zenodo.json5 +++ b/ci/zenodo.json5 @@ -61,13 +61,13 @@ ], "language": "eng", "license": "BSD-3-Clause", - "publication_date": "2023-03-08", - "title": "pypa:pywwt 0.19.0", + "publication_date": "2023-05-26", + "title": "pypa:pywwt 0.19.1", "upload_type": "software", - "version": "0.19.0" + "version": "0.19.1" }, "conceptdoi": "10.5281/zenodo.7164147", - "record_id": "7709624", - "doi": "10.5281/zenodo.7709624", - "bucket_link": "https://zenodo.org/api/files/5de8f4e9-57b7-42c8-9eb1-2f45eb01587c" + "record_id": "7972317", + "doi": "10.5281/zenodo.7972317", + "bucket_link": "https://zenodo.org/api/files/149211ce-a0cd-4bab-ae1b-12dfc814041d" } diff --git a/frontend/CHANGELOG.md b/frontend/CHANGELOG.md index 4041ebcc..20ac9965 100644 --- a/frontend/CHANGELOG.md +++ b/frontend/CHANGELOG.md @@ -1,3 +1,9 @@ +# npm:pywwt 1.5.1 (2023-05-26) + +- Require the version 0.14.2 of the research app, to get a fix for HiPS + catalogs loaded in HTTPS contexts (#352, @pkgw). + + # npm:pywwt 1.5.0 (2023-03-08) - Require version 0.14 of the research app, to get messages allowing the roll diff --git a/frontend/package.json b/frontend/package.json index 889d7561..4c8389e8 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -5,7 +5,7 @@ }, "dependencies": { "@jupyter-widgets/base": "^2 || ^3 || ^4 || ^5 || ^6", - "@wwtelescope/research-app": "^0.14", + "@wwtelescope/research-app": "^0.14.2", "underscore": "^1" }, "description": "AAS WorldWide Telescope from Python", @@ -42,5 +42,5 @@ "clean": "shx rm -rf dist", "pywwt-export": "npm run build && npm pack && node pywwt-export.js" }, - "version": "1.5.0" + "version": "1.5.1" } diff --git a/pyproject.toml b/pyproject.toml index 863f5fbe..c3c1ed5d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,4 +9,4 @@ annotated_files = [ ] [tool.cranko.internal_dep_versions] -"npm:pywwt" = "thiscommit:2022-12-01:HPOQ2Hc" +"npm:pywwt" = "thiscommit:2023-05-25:53DGAAv" diff --git a/pywwt/_version.py b/pywwt/_version.py index a65f1707..dc2c9cbe 100644 --- a/pywwt/_version.py +++ b/pywwt/_version.py @@ -1,4 +1,4 @@ -version_info = (0, 19, 0, 'final', 0) # cranko project-version tuple +version_info = (0, 19, 1, 'final', 0) # cranko project-version tuple _specifier_ = { "alpha": ".a", @@ -18,5 +18,5 @@ ) # The strings are auto-updated by Cranko during formal releases: -version_doi = "10.5281/zenodo.7709624" +version_doi = "10.5281/zenodo.7972317" concept_doi = "10.5281/zenodo.7164147" diff --git a/pywwt/jupyter.py b/pywwt/jupyter.py index 3ec6bdd5..03dc7416 100644 --- a/pywwt/jupyter.py +++ b/pywwt/jupyter.py @@ -17,7 +17,7 @@ __all__ = ["WWTJupyterWidget", "WWTLabApplication", "connect_to_app"] -_npm_version = "^1.4.0" # cranko internal-req npm:pywwt +_npm_version = "^1.5.1" # cranko internal-req npm:pywwt VIEW_MODULE_VERSION = _npm_version MODEL_MODULE_VERSION = _npm_version diff --git a/pywwt/tests/data/refimg_qt_full_step5/b.png b/pywwt/tests/data/refimg_qt_full_step5/b.png index 1e3e3aaf..76f4dead 100644 Binary files a/pywwt/tests/data/refimg_qt_full_step5/b.png and b/pywwt/tests/data/refimg_qt_full_step5/b.png differ diff --git a/pywwt/tests/data/refimg_qt_full_step5/c.png b/pywwt/tests/data/refimg_qt_full_step5/c.png index ef003fb9..59721ab6 100644 Binary files a/pywwt/tests/data/refimg_qt_full_step5/c.png and b/pywwt/tests/data/refimg_qt_full_step5/c.png differ diff --git a/pywwt/tests/data/refimg_qt_full_step5/d.png b/pywwt/tests/data/refimg_qt_full_step5/d.png index 375811e8..a818c895 100644 Binary files a/pywwt/tests/data/refimg_qt_full_step5/d.png and b/pywwt/tests/data/refimg_qt_full_step5/d.png differ diff --git a/pywwt/tests/data/refimg_qt_full_step5/f.png b/pywwt/tests/data/refimg_qt_full_step5/f.png index 3bdcbd74..4e5eda45 100644 Binary files a/pywwt/tests/data/refimg_qt_full_step5/f.png and b/pywwt/tests/data/refimg_qt_full_step5/f.png differ diff --git a/pywwt/tests/data/refimg_qt_full_step6/a.png b/pywwt/tests/data/refimg_qt_full_step6/a.png index 559c9241..f2251cf6 100644 Binary files a/pywwt/tests/data/refimg_qt_full_step6/a.png and b/pywwt/tests/data/refimg_qt_full_step6/a.png differ diff --git a/pywwt/tests/data/refimg_qt_full_step6/b.png b/pywwt/tests/data/refimg_qt_full_step6/b.png index 7be37ea2..777e7fca 100644 Binary files a/pywwt/tests/data/refimg_qt_full_step6/b.png and b/pywwt/tests/data/refimg_qt_full_step6/b.png differ diff --git a/pywwt/tests/data/refimg_qt_full_step6/c.png b/pywwt/tests/data/refimg_qt_full_step6/c.png index 1026ff1f..49fb64e6 100644 Binary files a/pywwt/tests/data/refimg_qt_full_step6/c.png and b/pywwt/tests/data/refimg_qt_full_step6/c.png differ diff --git a/pywwt/tests/data/refimg_qt_full_step6/d.png b/pywwt/tests/data/refimg_qt_full_step6/d.png index 31d05607..90c22c11 100644 Binary files a/pywwt/tests/data/refimg_qt_full_step6/d.png and b/pywwt/tests/data/refimg_qt_full_step6/d.png differ