Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 20.2.4 #8990

Merged
merged 18 commits into from
Oct 17, 2020
Merged

Release 20.2.4 #8990

merged 18 commits into from
Oct 17, 2020

Conversation

pradyunsg
Copy link
Member

@pradyunsg pradyunsg commented Oct 12, 2020

set -e

git cherry-pick -m 1 955daa9 # Architecture Documentation: CLI deep dive #7859
git cherry-pick -m 1 a13f201 # Update Caching documentation #8780
git cherry-pick -m 1 7fdf163 # Reformat a few spots in user guide #8795
git cherry-pick -m 1 0321dbc # Add ux docs to pip documentation #8807
git cherry-pick -m 1 e61bb61 # Pick up hashes from contraints files and intersect #8839
git cherry-pick -m 1 e408f70 # Document fast-track deprecation policy #8873
git cherry-pick -m 1 703d6ac # Cache found candidates #8912
# <handle conflicts>
git cherry-pick -m 1 428a790 # New resolver try user requested combinations first #8924
git cherry-pick -m 1 a3da6b2 # Don't crash on 'check' when METADATA is missing #8926
git cherry-pick -m 1 b98cf9c # Document Python support policy #8927
git cherry-pick -m 1 a4d3441 # Update docs index page about resolver and UX work #8933
git cherry-pick -m 1 a0f2f2c # docs: Add how to default to new resolver #8942
git cherry-pick -m 1 567630b # Include Requires-Python dep even with --no-deps #8758
# <handle conflicts>
git cherry-pick -m 1 3fe826c # Implement "lazy sequence" to avoid Internet access during candidate search #8932
# <handle conflicts>

nox -s prepare-release -- 20.2.4

Running tests locally on the actual release artifacts, since I don't feel that sure about this given how much the codebase has diverged.

@pradyunsg pradyunsg added skip news Does not need a NEWS file entry (eg: trivial changes) type: maintenance Related to Development and Maintenance Processes labels Oct 12, 2020
@pradyunsg
Copy link
Member Author

Running tests locally on the actual release artifacts, since I don't be that sure about this.

Other than an hg test that failed coz bitbucket is down, all is well.

@pradyunsg pradyunsg marked this pull request as ready for review October 12, 2020 22:44
@pradyunsg
Copy link
Member Author

Sleep time. Will merge + upload tomorrow.

@pradyunsg
Copy link
Member Author

Gonna redo this a bit and include #8932 into this.

@pypa-bot
Copy link

Hello!

I am an automated bot and I have noticed that this pull request is not currently able to be merged. If you are able to either merge the master branch into this pull request or rebase this pull request against master then it will eligible for code review and hopefully merging!

@pypa-bot pypa-bot added the needs rebase or merge PR has conflicts with current master label Oct 16, 2020
@pradyunsg
Copy link
Member Author

Ok CI -- once you pass, then I'll do all the releasy bits before I head to sleep. We're doing a Friday release this time. :3

And, I know there's merge conflicts right now -- the plan is to merge in master to this branch and drop the news fragments and then merge back in. It'll all work -- see ec3b313.

@pradyunsg pradyunsg closed this Oct 16, 2020
@pradyunsg pradyunsg reopened this Oct 16, 2020
@pypa-bot pypa-bot removed the needs rebase or merge PR has conflicts with current master label Oct 16, 2020
@pradyunsg
Copy link
Member Author

Of course, the CI doesn't want to run when there's merge conflicts. Please don't mind that temporary tag that's gonna go away soon. >.<

@pradyunsg
Copy link
Member Author

Let's try this again.

@pradyunsg
Copy link
Member Author

Okay -- one test fails on the release tag, when run locally:

E           pip._internal.exceptions.SubProcessError: Command errored out with exit status 255: hg clone --noupdate -q http://bitbucket.org/runeh/anyjson /private/var/folders/4d/bt0_xfx56bjfmmt2bv3r5_qh0000gn/T/pytest-of-pradyunsg/pytest-9/popen-gw2/test_install_global_option_usi0/cache/anyjson Check the logs for full command output.

I'm gonna say we're good, coz that's because it's an external thing which has changed (BitBucket's Mercurial support).

@pradyunsg pradyunsg merged commit f81cfff into pypa:master Oct 17, 2020
@pradyunsg pradyunsg deleted the release/20.2.4 branch October 17, 2020 21:43
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 7, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
skip news Does not need a NEWS file entry (eg: trivial changes) type: maintenance Related to Development and Maintenance Processes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants