Skip to content

Commit

Permalink
Release request commit created with Cranko.
Browse files Browse the repository at this point in the history
+++ cranko-rc-info-v1
[[projects]]
qnames = ["pywwt", "npm"]
bump_spec = "minor bump"

[[projects]]
qnames = ["pywwt", "pypa"]
bump_spec = "minor bump"

+++
  • Loading branch information
cranko committed Nov 28, 2023
2 parents b3e2be7 + 6e75020 commit 7b934e4
Show file tree
Hide file tree
Showing 7 changed files with 160 additions and 111 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# rc: minor bump

- Update the Jupyter widget implementation to use ES6 class syntax (#368,
@Carifio24). This should fix up compatibility with the 8.x series of
`ipywidgets`.

We have temporarily disabled DOI registration with this release (#369, @pkgw).
The associated release artifacts will report (obviously) bogus DOIs. This is due
to a recent major update to Zenodo, which seems to have broken their APIs. Our
Cranko release automation tool has not yet been updated to handle the new
system. We intend to address that soon, but we have internal motivations to get
this release out soon (see above), so we are going ahead without the Zenodo
deposition.


# pypa:pywwt 0.22.0 (2023-09-15)

- When using the bundled version of the WWT research app, make sure that we pull
in the new ESM-based WebGL rendering engine, by requiring the 0.16.x version
series of the research app (#366, #367, @pkgw). This shouldn't lead to any
Expand Down
23 changes: 21 additions & 2 deletions ci/azure-build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -213,11 +213,31 @@ jobs:
parameters:
setupBuild: true

# We install some extra deps here to make the docs build happy (it needs to
# import everything) while avoiding clashes between Conda and pip.
- bash: |
set -euo pipefail
source activate-conda.sh
set -x
\conda create -y -n build setuptools matplotlib pip pyopengl 'pyqt>=5.12' pyqtwebengine python=3.9 qtpy scipy shapely
\conda create -y -n build \
astropy \
astropy-sphinx-theme \
ipykernel \
jupyter_sphinx \
matplotlib \
nbclassic \
numpydoc \
pip \
pyopengl \
'pyqt>=5.12' \
pyqtwebengine \
python=3.9 \
qtpy \
scipy \
setuptools \
shapely \
sphinx \
sphinx-automodapi
conda activate build
pip install $BASH_WORKSPACE/sdist/*.tar.gz
displayName: Install from sdist
Expand All @@ -230,7 +250,6 @@ jobs:
source activate-conda.sh
conda activate build
set -x
\conda install -y astropy astropy-sphinx-theme ipykernel jupyter_sphinx nbclassic numpydoc sphinx sphinx-automodapi
cd docs
make html
displayName: Build docs
Expand Down
62 changes: 32 additions & 30 deletions ci/azure-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,33 +111,35 @@ jobs:
- bash: shred ~/.npmrc
displayName: Clean up credentials

- job: zenodo_publish
pool:
vmImage: ubuntu-latest
variables:
- group: Deployment Credentials

steps:
- template: azure-job-setup.yml
parameters:
setupCranko: true

- bash: |
set -xeuo pipefail
if cranko show if-released --exit-code pypa:pywwt ; then
cranko zenodo upload-artifacts --metadata=ci/zenodo.json5 $BASH_WORKSPACE/sdist/*.tar.gz
fi
displayName: Upload source tarball
env:
ZENODO_TOKEN: $(ZENODO_TOKEN)
- bash: |
set -xeuo pipefail
if cranko show if-released --exit-code pypa:pywwt ; then
cranko zenodo publish --metadata=ci/zenodo.json5
fi
displayName: Publish to Zenodo
env:
ZENODO_TOKEN: $(ZENODO_TOKEN)
# 2023 Nov: temporarily disabling Zenodo; they have just updated their API and broken
# everything, and we want to ge a release out.
#- job: zenodo_publish
# pool:
# vmImage: ubuntu-latest
# variables:
# - group: Deployment Credentials
#
# steps:
# - template: azure-job-setup.yml
# parameters:
# setupCranko: true
#
# - bash: |
# set -xeuo pipefail
#
# if cranko show if-released --exit-code pypa:pywwt ; then
# cranko zenodo upload-artifacts --metadata=ci/zenodo.json5 $BASH_WORKSPACE/sdist/*.tar.gz
# fi
# displayName: Upload source tarball
# env:
# ZENODO_TOKEN: $(ZENODO_TOKEN)
#
# - bash: |
# set -xeuo pipefail
#
# if cranko show if-released --exit-code pypa:pywwt ; then
# cranko zenodo publish --metadata=ci/zenodo.json5
# fi
# displayName: Publish to Zenodo
# env:
# ZENODO_TOKEN: $(ZENODO_TOKEN)
14 changes: 8 additions & 6 deletions ci/azure-sdist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,14 @@ jobs:
- bash: cranko release-workflow apply-versions
displayName: Apply Cranko versions

- bash: |
cranko zenodo preregister --metadata=ci/zenodo.json5 pypa:pywwt pywwt/_version.py CHANGELOG.md
displayName: "Preregister Zenodo DOI"
${{ if and(eq(variables['Build.SourceBranchName'], 'rc'), ne(variables['build.reason'], 'PullRequest')) }}:
env:
ZENODO_TOKEN: $(ZENODO_TOKEN)
# 2023 Nov: temporarily disabling Zenodo; they have just updated their API and broken
# everything, and we want to ge a release out.
# - bash: |
# cranko zenodo preregister --metadata=ci/zenodo.json5 pypa:pywwt pywwt/_version.py CHANGELOG.md
# displayName: "Preregister Zenodo DOI"
# ${{ if and(eq(variables['Build.SourceBranchName'], 'rc'), ne(variables['build.reason'], 'PullRequest')) }}:
# env:
# ZENODO_TOKEN: $(ZENODO_TOKEN)

- bash: |
set -xeuo pipefail
Expand Down
7 changes: 7 additions & 0 deletions frontend/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# rc: minor bump

- Update the Jupyter widget implementation to use ES6 class syntax (#368,
@Carifio24). This should fix up compatibility with the 8.x series of
`ipywidgets`.


# npm:pywwt 1.6.0 (2023-09-15)

- Require the new ESM-based engine through the 0.16.x series of the research app
(#366, @pkgw). This shouldn't lead to any user-visible changes (or even
developer-visible ones), but in an effort to smoke out any oversights, we take
Expand Down
Loading

0 comments on commit 7b934e4

Please sign in to comment.