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

[Rebase & Merge] Patch release 2.1.4 #19375

Merged
merged 47 commits into from
Jan 31, 2024
Merged

[Rebase & Merge] Patch release 2.1.4 #19375

merged 47 commits into from
Jan 31, 2024

Conversation

awaelchli
Copy link
Contributor

@awaelchli awaelchli commented Jan 30, 2024

What does this PR do?

Commits cherry-picked from master since the last release (2.1.3).

cc @Borda @carmocca @justusschock @awaelchli

tchaton and others added 30 commits January 30, 2024 21:03
handle more of the flaky tests
Bumps [Lightning-AI/utilities](https://github.com/lightning-ai/utilities) from 0.10.0 to 0.10.1.
- [Release notes](https://github.com/lightning-ai/utilities/releases)
- [Changelog](https://github.com/Lightning-AI/utilities/blob/main/CHANGELOG.md)
- [Commits](Lightning-AI/utilities@v0.10.0...v0.10.1)

---
updated-dependencies:
- dependency-name: Lightning-AI/utilities
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](actions/setup-python@v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jirka Borovec <[email protected]>
…react-ui-template/ui (#18814)

Bump @babel/traverse in /src/lightning/app/cli/react-ui-template/ui

Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.18.6 to 7.23.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…/react-ui-template/ui (#19255)

Bump follow-redirects in /src/lightning/app/cli/react-ui-template/ui

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.3 to 1.15.4.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.15.3...v1.15.4)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Copy link

codecov bot commented Jan 30, 2024

Codecov Report

Merging #19375 (f1ecaea) into release/stable (3e9f510) will decrease coverage by 0%.
The diff coverage is 79%.

Additional details and impacted files
@@               Coverage Diff                @@
##           release/stable   #19375    +/-   ##
================================================
- Coverage              83%      83%    -0%     
================================================
  Files                 441      444     +3     
  Lines               35733    36312   +579     
================================================
+ Hits                29590    30042   +452     
- Misses               6143     6270   +127     

Borda and others added 4 commits January 31, 2024 13:44
* ci: bump also conda requirements
* Apply suggestions from code review

---------

Co-authored-by: Justus Schock <[email protected]>
@awaelchli awaelchli force-pushed the draft-2.1.4 branch 2 times, most recently from e817925 to 1ebcfae Compare January 31, 2024 12:46
@awaelchli awaelchli changed the title [WIP] Patch release 2.1.4 Patch release 2.1.4 Jan 31, 2024
.github/CONTRIBUTING.md Outdated Show resolved Hide resolved
@Borda
Copy link
Member

Borda commented Jan 31, 2024

let's reset before the pre-commit commit e82ccdf and append #19380

@mergify mergify bot added the ready PRs ready to be merged label Jan 31, 2024
@awaelchli awaelchli force-pushed the draft-2.1.4 branch 2 times, most recently from 3e58e91 to ae836ba Compare January 31, 2024 17:54
@awaelchli awaelchli changed the title Patch release 2.1.4 [Rebase & Merge] Patch release 2.1.4 Jan 31, 2024
@lexierule lexierule merged commit 8623143 into release/stable Jan 31, 2024
170 of 174 checks passed
@lexierule lexierule deleted the draft-2.1.4 branch January 31, 2024 20:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
app (removed) Generic label for Lightning App package ci Continuous Integration data (external) litdata package dependencies Pull requests that update a dependency file dockers docs Documentation related fabric lightning.fabric.Fabric package pl Generic label for PyTorch Lightning package ready PRs ready to be merged release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants