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

[pre-commit.ci] pre-commit autoupdate #5136

Merged
merged 2 commits into from
Jan 19, 2023
Merged

[pre-commit.ci] pre-commit autoupdate #5136

merged 2 commits into from
Jan 19, 2023

Conversation

pre-commit-ci[bot]
Copy link
Contributor

@pre-commit-ci pre-commit-ci bot commented Jan 16, 2023

@pre-commit-ci
[pre-commit.ci] pre-commit autoupdate
b5adb38 
updates:
- [github.com/asottile/blacken-docs: v1.12.1 → 1.13.0](adamchainz/blacken-docs@v1.12.1...1.13.0)
pp-mo
pp-mo previously approved these changes Jan 17, 2023
View reviewed changes
@pp-mo pp-mo dismissed their stale review January 17, 2023 11:58

noticed pre-commit test failure, which needs addressing

@trexfeathers trexfeathers self-assigned this Jan 18, 2023
@trexfeathers
Copy link
Contributor

Note that I now need someone else to merge this as it contains a commit from me.

@pp-mo pp-mo merged commit a3b3560 into main Jan 19, 2023
@trexfeathers
Copy link
Contributor

Thanks @pp-mo!

tkknight added a commit to tkknight/iris that referenced this pull request Apr 22, 2023
@tkknight
Merge remote-tracking branch 'upstream/main' into dark_theme
c1e6e47 
* upstream/main: (23 commits)
  Lockfiles and pydata-sphinx-theme fix (SciTools#5188)
  Allow smarter weights (cubes, coordinates, cell measures, or ancillary variables) for aggregation (SciTools#5084)
  removed cell measure mask check and error (SciTools#5181)
  Updated environment lockfiles (SciTools#5177)
  Lazy weighted RMS calculation (SciTools#5017)
  Add coverage badge to README.md (SciTools#5176)
  Add coverage testing (SciTools#4765)
  Whats new updates for v3.4.1 .
  NetCDF thread safety take two (SciTools#5095)
  Updated environment lockfiles (SciTools#5163)
  Plugin support (SciTools#5144)
  Expand scope of common contributor links (SciTools#5159)
  Replace apparently retired UDUNITS documentation link. (SciTools#5153)
  [pre-commit.ci] pre-commit autoupdate (SciTools#5150)
  Fixing typo's in Gitwash. (SciTools#5145)
  add readme #showyourstripes (SciTools#5141)
  [pre-commit.ci] pre-commit autoupdate (SciTools#5143)
  Iris ❤ Xarray docs page. (SciTools#5025)
  [pre-commit.ci] pre-commit autoupdate (SciTools#5136)
  Updated citation (SciTools#5116)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pp-mo pp-mo pp-mo approved these changes

Assignees

@trexfeathers trexfeathers

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@trexfeathers @pp-mo