From e2aa3fbab42ae158cf4944984ddb9fb3560b0d6e Mon Sep 17 00:00:00 2001 From: adrinjalali Date: Mon, 27 Sep 2021 22:34:01 +0200 Subject: [PATCH 1/2] DOC update release process --- doc/developers/maintainer.rst | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/doc/developers/maintainer.rst b/doc/developers/maintainer.rst index fdf191ef8843c..3e78ebb01b69c 100644 --- a/doc/developers/maintainer.rst +++ b/doc/developers/maintainer.rst @@ -211,6 +211,12 @@ Making a release https://github.com/scikit-learn/scikit-learn/actions?query=workflow%3A%22Publish+to+Pypi%22 +4.1 You can test the conda-forge builds by submitting a PR to the feedstock + repo: https://github.com/conda-forge/scikit-learn-feedstock. If you want to + publish an RC release on conda-forge, the PR should target the `rc` branch + as opposed to the `master` branch. The two branches need to be kept sync + together otherwise. + 5. If this went fine, you can proceed with tagging. Proceed with caution. Ideally, tags should be created when you're almost certain that the release is ready, since adding a tag to the main repo can trigger certain automated @@ -272,11 +278,11 @@ Making a release git clone --depth 1 --no-checkout git@github.com:scikit-learn/scikit-learn.github.io.git cd scikit-learn.github.io echo stable > .git/info/sparse-checkout - git checkout master + git checkout main rm stable ln -s 0.999 stable sed -i "s/latestStable = '.*/latestStable = '0.999';/" versionwarning.js - git add stable/ versionwarning.js + git add stable versionwarning.js git commit -m "Update stable to point to 0.999" git push origin master @@ -293,14 +299,11 @@ The following GitHub checklist might be helpful in a release PR:: * [ ] merge the PR with `[cd build]` commit message to upload wheels to the staging repo * [ ] upload the wheels and source tarball to https://test.pypi.org * [ ] create tag on the main github repo - * [ ] upload the wheels and source tarball to PyPI - * [ ] https://github.com/scikit-learn/scikit-learn/releases draft * [ ] confirm bot detected at https://github.com/conda-forge/scikit-learn-feedstock and wait for merge + * [ ] upload the wheels and source tarball to PyPI * [ ] https://github.com/scikit-learn/scikit-learn/releases publish - * [ ] fix the binder release version in ``.binder/requirement.txt`` (see - #15847) - * [ ] announce on mailing list and on twitter + * [ ] announce on mailing list and on twitter, and LinkedIn Merging Pull Requests --------------------- From fbc52398dd8dc3e29ba83f2c700c1baf59b75fad Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Tue, 28 Sep 2021 11:16:27 +0200 Subject: [PATCH 2/2] Update doc/developers/maintainer.rst --- doc/developers/maintainer.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/developers/maintainer.rst b/doc/developers/maintainer.rst index 3e78ebb01b69c..ffefbb767131a 100644 --- a/doc/developers/maintainer.rst +++ b/doc/developers/maintainer.rst @@ -303,7 +303,7 @@ The following GitHub checklist might be helpful in a release PR:: https://github.com/conda-forge/scikit-learn-feedstock and wait for merge * [ ] upload the wheels and source tarball to PyPI * [ ] https://github.com/scikit-learn/scikit-learn/releases publish - * [ ] announce on mailing list and on twitter, and LinkedIn + * [ ] announce on mailing list and on Twitter, and LinkedIn Merging Pull Requests ---------------------