Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

@trexfeathers
Copy link
Contributor

πŸš€ Pull Request

Description

This brings in the changes from #4968, as well as fresh lock-files.


Consult Iris pull request check list

trexfeathers and others added 2 commits September 26, 2022 15:55
* Updated environment lockfiles

* Adjustments for Cartopy v0.21.0 (SciTools/cartopy@fcb784d).

* Cartopy >=0.21 pin.

* What's New entry.

* WIP try netCDF4 pin.

* Try pip installing netcdf4==1.6.1 as requested by @ocefpaf.

* Revert "Try pip installing netcdf4==1.6.1 as requested by @ocefpaf."

This reverts commit ce9f890.

* netcdf4!=1.6.1

* Align Conda YAML formatting.

Co-authored-by: Lockfile bot <[email protected]>
@trexfeathers trexfeathers added the Type: Feature Branch Highlight this for a feature branch label Sep 26, 2022
@lbdreyer lbdreyer merged commit 2a41be2 into SciTools:v3.3.x Sep 26, 2022
@lbdreyer
Copy link
Member

lbdreyer commented Sep 26, 2022

Thanks @trexfeathers ! Hopefully this should fix the docs build 🀞

stephenworsley added a commit to stephenworsley/iris that referenced this pull request Sep 29, 2022
* v3.3.x:
  Update whatsnew for 3.3.1 release (SciTools#5002)
  Port dependency fixes to `v3.3.x`. (SciTools#4992)
  Fix name loader problem (SciTools#4933)
  Reinstate CubeList._repr_html_() (SciTools#4976)

# Conflicts:
#	.github/workflows/ci-tests.yml
#	requirements/ci/nox.lock/py310-linux-64.lock
#	requirements/ci/nox.lock/py38-linux-64.lock
#	requirements/ci/nox.lock/py39-linux-64.lock
#	requirements/ci/py310.yml
#	requirements/ci/py38.yml
#	requirements/ci/py39.yml
#	setup.cfg
@trexfeathers trexfeathers deleted the dependency_fixes branch October 12, 2022 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Type: Feature Branch Highlight this for a feature branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants