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

Remove Resolve test workaround #5267

Merged
merged 1 commit into from
Apr 21, 2023
Merged

Conversation

rcomer
Copy link
Member

@rcomer rcomer commented Apr 21, 2023

🚀 Pull Request

Description

We dropped support for python 3.6, so this workaround is no longer needed.


Consult Iris pull request check list

@trexfeathers
Copy link
Contributor

Unfortunate timing @rcomer! I'm merging #5262 first so you're guaranteed a latest.rst conflict.

@rcomer
Copy link
Member Author

rcomer commented Apr 21, 2023

Oh well, you can't win them all...

@codecov
Copy link

codecov bot commented Apr 21, 2023

Codecov Report

Patch and project coverage have no change.

Comparison is base (21fd556) 89.31% compared to head (c74b39d) 89.31%.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #5267   +/-   ##
=======================================
  Coverage   89.31%   89.31%           
=======================================
  Files          88       88           
  Lines       22279    22279           
  Branches     4881     4881           
=======================================
  Hits        19898    19898           
  Misses       1635     1635           
  Partials      746      746           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

Copy link
Contributor

@trexfeathers trexfeathers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change of plan, #5262 is getting rebased/updated after #5226. So this one is going in straight away.

@trexfeathers trexfeathers merged commit 619de4e into SciTools:main Apr 21, 2023
@rcomer rcomer deleted the resolve-copy branch April 21, 2023 09:51
tkknight added a commit to tkknight/iris that referenced this pull request Apr 22, 2023
* upstream/main:
  Updated environment lockfiles (SciTools#5270)
  Drop python3.8 support (SciTools#5269)
  build wheel from sdist, not src (SciTools#5266)
  Lazy netcdf saves (SciTools#5191)
  move setup.cfg to pyproject.toml (SciTools#5262)
  Support Python 3.11 (SciTools#5226)
  Remove Resolve test workaround (SciTools#5267)
  add missing whatsnew entry (SciTools#5265)
tkknight added a commit to tkknight/iris that referenced this pull request Apr 22, 2023
* upstream/main: (61 commits)
  Updated environment lockfiles (SciTools#5270)
  Drop python3.8 support (SciTools#5269)
  build wheel from sdist, not src (SciTools#5266)
  Lazy netcdf saves (SciTools#5191)
  move setup.cfg to pyproject.toml (SciTools#5262)
  Support Python 3.11 (SciTools#5226)
  Remove Resolve test workaround (SciTools#5267)
  add missing whatsnew entry (SciTools#5265)
  make help (SciTools#5258)
  automate pypi manifest checking (SciTools#5259)
  drop sphinxcontrib-napoleon (SciTools#5263)
  add missing test result data (SciTools#5260)
  fix indentation and remove ref to ssstack (SciTools#5256)
  review actions
  update .git-blame-ignore-revs
  adopt codespell
  Adopt sphinx design (SciTools#5127)
  Bump scitools/workflows from 2023.04.2 to 2023.04.3 (SciTools#5253)
  refresh manual pypi publish instructions (SciTools#5252)
  Updated environment lockfiles (SciTools#5250)
  ...
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.

None yet

2 participants