linux kernel version fix for conda 4.10+#4084
Merged
jamesp merged 1 commit intoSciTools:masterfrom Apr 8, 2021
Merged
Conversation
Member
|
@bjlittle are these test failures due to matplotlib changes? They do not appear to be related to the conda 4.10 issue. Also, are you happy with the small doc change going in in this PR too? |
Member
Author
|
@jamesp Just spinning back up on this... sorry. Yup, the extra failures are due to Also, yeah, I think that it's fine to include the doc changes here... actually, it's necessary otherwise the CI will fail 😢 |
jamesp
approved these changes
Apr 8, 2021
Member
Author
|
@jamesp Oppsie... this PR wasn't completely finished and ready to merge. I'll push my other changes |
Merged
tkknight
added a commit
to tkknight/iris
that referenced
this pull request
May 17, 2021
* master: (49 commits) Update CI environment lockfiles + Cartopy 0.19 changes (SciTools#4125) separate arg types from descriptions (SciTools#4100) Use assertArrayAllClose for sqrt test (SciTools#4118) Removed branch suffix (SciTools#4117) Corrected plot_anomaly_log_colouring for new Matplotlib linscale rules. (SciTools#4115) replace most recent hashes (SciTools#4112) Linkcheck update (SciTools#4104) CI lockfiles (SciTools#4108) Fix bug in gallery_tests runner (SciTools#4111) add logo to conda and pypi badges (SciTools#4088) pre-commit-ci update (SciTools#4092) Fix cirrus ci and mpl (SciTools#4087) Update readme docs stable (SciTools#4089) linux kernel version fix for conda 4.10+ (SciTools#4084) update docs pypi instructions (SciTools#4077) update flake8 pre-commit (SciTools#4067) Add GitHub discussions badge (SciTools#4070) conda requirements add pip (SciTools#4062) add pre-commit.ci badge and doc support (SciTools#4061) cirrus-ci credits for non-master (SciTools#4060) ...
tkknight
added a commit
to tkknight/iris
that referenced
this pull request
May 26, 2021
* master: (87 commits) Contourf Antialias Fix (SciTools#4150) minor tidy of cirrus and nox (SciTools#4152) update bug and feature templates (SciTools#4147) Update CI environment lockfiles + Cartopy 0.19 changes (SciTools#4125) separate arg types from descriptions (SciTools#4100) Use assertArrayAllClose for sqrt test (SciTools#4118) Removed branch suffix (SciTools#4117) Corrected plot_anomaly_log_colouring for new Matplotlib linscale rules. (SciTools#4115) replace most recent hashes (SciTools#4112) Linkcheck update (SciTools#4104) CI lockfiles (SciTools#4108) Fix bug in gallery_tests runner (SciTools#4111) add logo to conda and pypi badges (SciTools#4088) pre-commit-ci update (SciTools#4092) Fix cirrus ci and mpl (SciTools#4087) Update readme docs stable (SciTools#4089) linux kernel version fix for conda 4.10+ (SciTools#4084) update docs pypi instructions (SciTools#4077) update flake8 pre-commit (SciTools#4067) Add GitHub discussions badge (SciTools#4070) ...
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🚀 Pull Request
Description
This PR addresses the issue raise in conda/conda#10596
Consult Iris pull request check list