Skip to content

Merge main into v1 #780

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
Merged
edoardopirovano merged 10 commits into from
Oct 18, 2021
Merged

Merge main into v1 #780

edoardopirovano merged 10 commits into from
Oct 18, 2021

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Oct 18, 2021 •
edited by edoardopirovano
Loading

Merging a56f725 into v1

Conductor for this PR is @aibaars

Contains the following pull requests:

Please review the following:

  • The CHANGELOG displays the correct version and date.
  • The CHANGELOG includes all relevant, user-facing changes since the last release.
  • There are no unexpected commits being merged into the v1 branch.
  • The docs team is aware of any documentation changes that need to be released.
  • The mergeback PR is merged back into main after this PR is merged.

github-actions[bot] and others added 10 commits October 8, 2021 13:42
Update changelog and version after v1.0.18
faa3cfa
1.0.19
5153cc4
Update checked-in dependencies
f215973
@edoardopirovano
Merge pull request #768 from github/mergeback/v1.0.18-to-main-fd3190bb
1ebb0a0 
Mergeback v1.0.18 refs/heads/v1 into main
@aeisenberg
Fix failing python tests
3df2172 
The requests module 1.2.3 is no longer compatible with python >=3.10.0.
So, instead use 2.26.0, the most recent version that is compatible with
our supported python versions at the time of this commit.
@aeisenberg
Remove explicit 2.26.0 version in python tests
43ea2ce 
Also, rename test scripts to indicate the version they are using.
@aibaars
Merge pull request #778 from github/aeisenberg/fix-python-tests
286a237 
Fix failing python tests
@aibaars
Update default codeql bundle to 2.6.3-a
5f37061
@aibaars
Merge pull request #773 from github/codeql-2.6.3-a-release-prep
a56f725 
Update default codeql bundle to 2.6.3-a
1.0.19
f5e572f
@edoardopirovano edoardopirovano marked this pull request as ready for review October 18, 2021 11:24
@edoardopirovano edoardopirovano requested a review from a team as a code owner October 18, 2021 11:24
@edoardopirovano edoardopirovano merged commit 1990ded into v1 Oct 18, 2021
@edoardopirovano edoardopirovano deleted the update-v1.0.19-a56f7259 branch October 18, 2021 22:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@edoardopirovano edoardopirovano edoardopirovano approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@aibaars aibaars

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@edoardopirovano @aibaars @aeisenberg