-
Notifications
You must be signed in to change notification settings - Fork 169
Release Procedures
This guide assumes that you have cloned jwst
, and added a remote named upstream
pointing to the central repository:
git remote add upstream https://github.com/spacetelescope/jwst.git
Before starting the release process, ensure that the latest Jenkins regression test run for the main
/ master
branch has passed successfully.
-
Edit the change log
CHANGES.rst
; in the entry corresponding to your intended release (a.b.c (unreleased)
), changeunreleased
to the current date inYYYY-MM-DD
format. Also add a new change log entry above, with the formata.b.d (unreleased)
.+0.16.1 (unreleased) +=================== + + + -0.16.0 (unreleased) +0.16.0 (2020-05-04) ===================
-
Update the
Software vs DMS build version map
section ofREADME.md
to show the latest release version, date, and theCRDS_CONTEXT
this release is being currently tested with (this is usually the current operational context:crds list --operational-context
). -
Update the release version and date in
CITATION.cff
, and add any new contributors. -
Make sure dependencies in
setup.cfg
are updated. In particular, ensure thatcrds
,stcal
,stdatamodels
, andstpipe
include their newest tested versions, and exclude any older versions with incompatible API.
Important
Ifstcal
andstdatamodels
have new updates that change the API used byjwst
, make sure to use the relevant reference files on Artifactory when testing.
-
Update the
requirements-sdp.txt
file, as per its commented instructions. -
Commit your changes, make a PR, and merge to
main
/master
onspacetelescope/jwst
.
If this release is a cherry-picked patch to an release branch, make the changes on the master
branch first, then cherry-pick and modify as needed over to the release branch. Note that cherry-picked release branches may also need to change JenkinsfileRT
, so artifact publication happens when then regression tests pass.
If you're making a major or minor version release, then the release branch will not yet exist. If you're releasing a patch version, then a release branch will already exist. Select one of the next two sections accordingly.
-
Fetch and checkout the upstream
main
/master
:git fetch --all --tags git checkout -t upstream/master
-
Inspect the log to ensure that no commits have snuck in since your change log update:
git log
-
Create a new release branch. The name of the release branch should share the major and minor version of your release version, but the patch version should be
x
. For example, when releasing1.8.0
, name the branchrelease/1.8.x
.
git checkout -b release/a.b.x
- Push the branch to the upstream remote:
git push -u upstream HEAD
In the case of a patch release, the release branch will already exist.
-
Checkout and freshen release branch (this assumes that your local branch is already tracking
upstream/release/a.b.x
):git checkout release/a.b.x git pull
-
Cherry-pick relevant commits from
main
/master
that should be included in the patch release (including the new changelog commit):git cherry-pick ...
Note
Alternatively, you can pull all changes frommaster
into the release branch:git fetch upstream git pull upstream master
-
Push updates to the upstream remote:
git push upstream HEAD
Note
If the release branch has diverged frommaster
, you will have to run the regression tests on the release branch and have them pass to be able to do the automated release to DMS (see the DMS release section below for details). Additionally, you should tagmain
/master
with a development tag (i.e.1.8.9dev
) so the locally-installed version shows correctly.
Say a bug needs to be fixed in 0.16.0
, and is also present in master
.
-
Fix the bug on
master
through a PR. Merge it and get the hash of the commit. As an example, let's say the commit hash isf41120e
. -
Cherry pick all commits that need to be included in the patch release.
git cherry-pick -x f41120e
-
If there are conflicts, resolve them before you continue with other commits. In general, start with the oldest commit so that conflicts are minimized.
Warning
Sometimes a commit is a merge commit with more than one parent. The above command will fail with an error message:error: Commit f41120e is a merge but no -m option was given. fatal: cherry-pick failed
This discussion might be helpful.
In this case, look at the parents of the commit and choose which one is the ancestor:
git cherry-pick -x -m 1 f41120e(this tells
git
to use the first parent)
- Use
git show
to verify which changes are going into the release branch.
The creation or update of the release branch should have triggered a CI job on GitHub actions. Find the latest build on the release branch in the Actions
tab:
https://github.com/spacetelescope/jwst/actions/workflows/ci.yml
At this point, you should have the release branch checked out and ready to tag.
-
Create an annotated tag with a name that matches your intended release:
git tag -a a.b.c -m "JWST DMS Build x.y"
-
Push the new tag to the upstream remote:
git push upstream a.b.c
The stable
branch points to the latest official release of jwst
. If the current release has become the latest, then the next step is to rewrite the stable branch to point our new tag.
git checkout stable
git reset --hard a.b.c
git push upstream stable --force
This step is optional, but it is a good smoke check, especially if there have been any changes to the install procedure (i.e. setup.py
, setup.cfg
, pyproject.toml
) since the last release, or any changes to README.md
or anything else that gets included in long_description
in setup.cfg
.
This step requires permissions to write to test.pypi.org
for jwst
.
Before proceeding, you will need the twine
and build
packages:
pip install twine build
-
Checkout the release tag, clean the directory, and make sure umask and permissions are set correctly:
git checkout a.b.c git clean -xdf umask 0022 chmod -R a+Xr .
-
Check the package setup and create the package sdist and wheel:
python -m build .
-
Upload the package to PyPi's test server (you need an account and be added as maintainer):
twine check --strict dist/* twine upload --repository testpypi dist/*
-
Check that it looks good on the test server. Make sure it installs without errors in a new environment:
pip install -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple jwst[test]==a.b.c pip install pytest-xdist
-
Run the tests on the installed package. Change to a directory that does not contain the
jwst
source and confirm that tests pass on the installed package.pushd / pytest -n auto --pyargs jwst popd
-
If the package looks good on test.pypi.org and installs OK and the tests pass, then proceed.
-
Click Draft a new release.
-
Select the existing tag that you just created and pushed, and title the release
JWST Build x.y rcN
, whereN
is the current release candidate for DMS (we can always remove thercN
part from the title later if this turns out to be the final release). -
Publish
the release.
Publishing the GitHub release should trigger an automated workflow that should build the wheel and source distribution and publish the package to PyPI.
After this workflow completes, you can confirm that the new release appears on PyPI: https://pypi.org/project/jwst/#history
Additionally, you can test installing the new version with pip
:
pip install jwst==a.b.c
-
Make sure
CHANGES.rst
has a section for the next release. -
Remove requirements from
requirements-sdp.txt
. -
If the commit with the release tag is not on
main
/master
, you should tag the next commit onmain
/master
with a development tag (i.e. if we just released version1.2.1
onrelease/1.2.x
, the development tag should be1.2.2.dev
on themain
/master
commit directly after the divergence). This allowssetuptools-scm
to show the correct version when installing the package locally (pip install .
).git fetch upstream git checkout upstream/master git tag -a a.b.d.dev -m "development tag after divergence" git push upstream a.b.d.dev
If the tagged commit is on the main
/ master
branch, skip the next section and go to Run the JWSTDP
Jenkins job, below.
If you are making a patch release that required cherry-picking onto the release branch, run the regression tests on that release branch and make sure they pass so that the build artifacts are created with the correct environment.
-
Use the
Configure
button (the gear icon) on theRT / JWST
regression test job onplwishmaster
, go to thePipeline
section, and change the target branch fromBranch Specifier (blank for default): */master
to the tag
Branch Specifier (blank for default): tags/a.b.c
-
Automatic publication to Artifactory of the build artifacts only happens when running from the
RT / JWST
job on themain
/master
branch. To allow it to publish from a release branch, remove this line inJenkinsfileRT
from the release branch:jobconfig.publish_env_filter = "spacetelescope/master"
-
Click the
Build with Parameters
button (the play icon) and set the following parameters:-
env
: if the regression test suite for this patch has not diverged from master, use the default (dev
). Otherwise, use the correcta.b.c
snapshot on Artifactory. -
PYTEST_ARGS
: this parameter can be used to target the build towards tests that need to be "okified", to quickly run them.Important
If you use-k some_test_pattern
, it is also a good idea to add--no-cov
so that coverage reports of subsets of the tests do not get uploaded.
-
-
Go back to
Configure
and switch the branch back to*/master
for subsequent jobs.
-
Check the Artifactory results directory for build artifacts from the passing regression tests (
*stable*.txt
). -
If the regression tests have not passed, you will have to trawl
jwcalibdev
andboyle
(currently) to get the linux and MacOS build artifacts. Current locations (which get wiped daily) arejwcalibdev:/data1/jenkins/workspace/RT/JWST/clone/*stable*.txt boyle:/users/iraf/build/boyle/workspace/RT/JWST/clone/*stable*.txt
And push these up to Artifactory at
https://bytesalad.stsci.edu/artifactory/jwst-pipeline-results/
The release job will edit the requirements files so that
jwst
will have the specified tag (instead of the git hash from the regression tests run), and it will populate the new release here. -
Run the Jenkins JWSTDP release job, adding yourself to the
notification_recipients
. Contact Nadia Dencheva if there are any problems. -
If this is the final release for a build, an announcement email should be sent that includes all of JWST DMS, INS, and Mission Office. This email should include the link to the SDN documentation and installations for how to install the specific build.
Go to the Artifactory web interface and copy the passing test input and truth data from
jwst-pipeline/dev
to a new directory named the same as the release tag
jwst-pipeline/a.b.c
CRDS maintains a reference file, CALVER
, and metadata that are tied to JWST software releases. Review the two substeps that are part of the CRDS S/W Release Process. If either require updates due to a JWST release, file a CCD issue to update CRDS as needed.
The two subseps are: