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.

Sign up for GitHub

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

Jump to bottom

Merge releases/v2 into releases/v1 #1264

Merged
merged 31 commits into from Sep 22, 2022
Merged

Merge releases/v2 into releases/v1 #1264

merged 31 commits into from Sep 22, 2022

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Sep 21, 2022 •
edited by henrymercer

Merging 86f3159 into releases/v1

Conductor for this PR is @henrymercer.

Contains the following pull requests:

Please do the following:

  • Ensure the CHANGELOG displays the correct version and date.
  • Ensure the CHANGELOG includes all relevant, user-facing changes since the last release.
  • Check that there are not any unexpected commits being merged into the releases/v1 branch.
  • Ensure the docs team is aware of any documentation changes that need to be released.
  • Remove and re-add the "Update dependencies" label to the PR to trigger just this workflow.
  • Wait for the "Update dependencies" workflow to push a commit updating the dependencies.
  • Mark the PR as ready for review to trigger the full set of PR checks.
  • Approve and merge this PR.

henrymercer and others added 30 commits September 15, 2022 16:20
@henrymercer
Remove now-duplicated PR titles from release PR descriptions
4f10467
@edoardopirovano
Add CHANGELOG note for TRAP caching
82495d8
@edoardopirovano
Merge pull request #1251 from github/edoardo/trap-caching-changenote
b15cc00 
Add CHANGELOG note for TRAP caching
Update changelog and version after v2.1.24
9f79e5f
Update checked-in dependencies
e0ef82e
@henrymercer
Add advice to the backport PR on how to run the checks quicker
fb28913
@henrymercer
Add advice to the mergeback PR on how to run the checks quicker
2e9fbe3
@henrymercer
Merge pull request #1252 from github/mergeback/v2.1.24-to-main-904260d7
aaca819 
Mergeback v2.1.24 refs/heads/releases/v2 into main
@RasmusWL
python-setup: Allow newest virtualenv
5ffcfe9 
Context for previous version is
#862

Locally, I was able to install `20.15.1` with Python2.

I don't see any reason why python3 version should be restricted.
@RasmusWL
python-setup: Fix venv creation in Ubuntu 22.04
e1ce6e3 
Fixes #1249
@RasmusWL
python-setup: Add support for Poetry 1.2
70509c3
@henrymercer
Merge pull request #1254 from github/henrymercer/improve-release-pr-d…
038242a 
…escription

Improve the descriptions of PRs created by the release process
@RasmusWL @henrymercer
Update CHANGELOG.md
1309aaf 
Co-authored-by: Henry Mercer <henrymercer@github.com>
@RasmusWL
Merge pull request #1256 from github/rasmuswl/newer-virtualenv
c2c7bba 
python-setup: Allow newest `virtualenv`
@RasmusWL
python-setup: run tests on Ubuntu 22.04
3f97671
@RasmusWL
python-setup: change env passing
2264307
@RasmusWL
python-setup: flush at the end of _check_call
ca8a78d
@RasmusWL
Merge pull request #1258 from github/rasmuswl/poetry-v1.2
417059f 
python-setup: Add support for Poetry 1.2
@RasmusWL
python-setup: Fail early if installing for Python 2, and python2 no…
1fa5d72 
…t available
@RasmusWL
add missing spaces
93ba53f
@RasmusWL
python-setup: Flush even more
8a893dd
@RasmusWL
python-setup: Disable python2 tests on ubuntu-22.04
b2fc1e1
@RasmusWL @henrymercer
Apply suggestions from code review
32ca2cf 
Co-authored-by: Henry Mercer <henrymercer@github.com>
@henrymercer
Merge pull request #1257 from github/rasmuswl/fix-ubuntu22.04-venv-cr…
ff5ca12 
…eation

python-setup: Fix venv creation in Ubuntu 22.04
Update changelog for v2.1.25
d1e2e02
@henrymercer
Merge pull request #1261 from github/update-v2.1.25-ff5ca122
86f3159 
Merge main into releases/v2
Revert "Update version and changelog for v1.1.24"
d4e6145 
This reverts commit f216d96.
Revert "Update checked-in dependencies"
63e162a 
This reverts commit fea8169.
Merge remote-tracking branch 'origin/releases/v2' into update-v1.1.25…
7b13a3f 
…-86f3159a
Update version and changelog for v1.1.25
e4a1505
@github-actions github-actions bot added the Update dependencies Trigger PR workflow to update dependencies label Sep 21, 2022
@henrymercer henrymercer added Update dependencies Trigger PR workflow to update dependencies and removed Update dependencies Trigger PR workflow to update dependencies labels Sep 21, 2022
@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Sep 21, 2022
@henrymercer henrymercer marked this pull request as ready for review September 21, 2022 19:06
@henrymercer henrymercer requested review from a team as code owners September 21, 2022 19:06
@henrymercer henrymercer merged commit f630e9a into releases/v1 Sep 22, 2022
@henrymercer henrymercer deleted the update-v1.1.25-86f3159a branch September 22, 2022 09:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@henrymercer henrymercer henrymercer approved these changes

Assignees

@henrymercer henrymercer

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@henrymercer @edoardopirovano @RasmusWL