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

Revert "Update CI environment lockfiles" #341

Merged
merged 1 commit into from
Feb 28, 2024

Conversation

stephenworsley
Copy link
Contributor

Reverts #335

Copy link

codecov bot commented Feb 28, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.86%. Comparing base (0586677) to head (d8ec3fc).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #341   +/-   ##
=======================================
  Coverage   98.86%   98.86%           
=======================================
  Files          36       36           
  Lines        3862     3862           
=======================================
  Hits         3818     3818           
  Misses         44       44           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@bjlittle bjlittle self-assigned this Feb 28, 2024
@bjlittle
Copy link
Member

Discussed the CI benchmark failure with @stephenworsley, and we're okay to merge - this is failure on the main commit.

You okay with this @stephenworsley ?

@bjlittle bjlittle self-requested a review February 28, 2024 16:49
@bjlittle bjlittle merged commit eeba87b into main Feb 28, 2024
15 of 16 checks passed
stephenworsley added a commit to stephenworsley/iris-esmf-regrid that referenced this pull request Apr 25, 2024
* main: (42 commits)
  Update lockfiles and fix for new esmpy (SciTools#342)
  Fix for esmpy (SciTools#353)
  Fix usage of map_blocks (SciTools#338)
  Revert "Updated environment lockfiles (SciTools#335)" (SciTools#341)
  Updated environment lockfiles (SciTools#335)
  Bump actions/cache from 3 to 4 (SciTools#333)
  Bump actions/upload-artifact from 3 to 4 (SciTools#324)
  Bump actions/stale from 8.0.0 to 9.0.0 (SciTools#322)
  fix asv (SciTools#339)
  [pre-commit.ci] pre-commit autoupdate (SciTools#330)
  Bump scitools/workflows from 2023.09.0 to 2024.01.0 (SciTools#334)
  Updated environment lockfiles (SciTools#327)
  [pre-commit.ci] pre-commit autoupdate (SciTools#328)
  Updated environment lockfiles (SciTools#304)
  Add CITATION.cff (SciTools#319)
  updated for enums (SciTools#293)
  Flake8 compliant type checking. (SciTools#316)
  update to v0.10.dev0 (SciTools#314)
  Update to v0.9 (SciTools#313)
  First pass at mesh to mesh (SciTools#311)
  ...

# Conflicts:
#	CHANGELOG.md
#	esmf_regrid/esmf_regridder.py
#	esmf_regrid/schemes.py
stephenworsley added a commit to stephenworsley/iris-esmf-regrid that referenced this pull request May 2, 2024
* main: (29 commits)
  Bump scitools/workflows from 2024.01.0 to 2024.04.3 (SciTools#356)
  Bump peter-evans/create-pull-request from 5.0.2 to 6.0.5 (SciTools#355)
  [pre-commit.ci] pre-commit autoupdate (SciTools#336)
  Updated environment lockfiles (SciTools#344)
  Update lockfiles and fix for new esmpy (SciTools#342)
  Fix for esmpy (SciTools#353)
  Fix usage of map_blocks (SciTools#338)
  Revert "Updated environment lockfiles (SciTools#335)" (SciTools#341)
  Updated environment lockfiles (SciTools#335)
  Bump actions/cache from 3 to 4 (SciTools#333)
  Bump actions/upload-artifact from 3 to 4 (SciTools#324)
  Bump actions/stale from 8.0.0 to 9.0.0 (SciTools#322)
  fix asv (SciTools#339)
  [pre-commit.ci] pre-commit autoupdate (SciTools#330)
  Bump scitools/workflows from 2023.09.0 to 2024.01.0 (SciTools#334)
  Updated environment lockfiles (SciTools#327)
  [pre-commit.ci] pre-commit autoupdate (SciTools#328)
  Updated environment lockfiles (SciTools#304)
  Add CITATION.cff (SciTools#319)
  updated for enums (SciTools#293)
  ...

# Conflicts:
#	esmf_regrid/schemes.py
@stephenworsley stephenworsley deleted the revert-335-auto-update-lockfiles branch October 3, 2024 09:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants