some iris 3.1.0 adjustments

[jgriesfeller]

1st try for an iris 3.1.0 patch

[jgriesfeller]

Found the problems:

>>> type(cubes)
<class 'list'>

but that needs to be of type

>>> type(iris.cube.CubeList(cubes))
<class 'iris.cube.CubeList'>

for the concatenation to work.

In addition iris.cube.CubeList.concatenate_cube returns a cube now and not a cubelist.

Writing some code now...

[codecov]

Codecov Report

Merging #493 (706770d) into main-dev (084c8b8) will increase coverage by 0.00%.
The diff coverage is 100.00%.

❗ Current head 706770d differs from pull request most recent head 996196b. Consider uploading reports for the commit 996196b to get more accurate results

@@            Coverage Diff            @@
##           main-dev     #493   +/-   ##
=========================================
  Coverage     76.61%   76.61%           
=========================================
  Files            97       97           
  Lines         17357    17358    +1     
=========================================
+ Hits          13298    13299    +1     
  Misses         4059     4059           

Flag	Coverage Δ
unittests	76.61% <100.00%> (+<0.01%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
pyaerocom/helpers.py	76.32% <100.00%> (ø)
pyaerocom/io/iris_io.py	94.57% <100.00%> (+0.02%)	⬆️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 084c8b8...996196b. Read the comment docs.

[jgliss]

To test that CI passes, I think you need to remove the upper version limit in setup.py (section install_requires) and in pyaerocom_env.yml. Right now it should still be testing iris<3.1.0

[jgriesfeller]

I have removed the limitation of the iris version in setup.py. CI still works :-)

[jgliss]

You also need to update iris version in file pyaerocom_env.yml

[jgliss]

Maybe:

Suggested change

	'scitools-iris>=3.0.1',
	'scitools-iris>=3.1.0',

[jgliss]

I think we should set it to 3.1.0.

[jgriesfeller]

done, although that API is not new. Has been there since at least v1.9. https://scitools.org.uk/iris/docs/v1.9.0/html/iris/iris/cube.html#iris.cube.CubeList.concatenate_cube

[jgriesfeller]

pyaerocom_env.yml has been updated as well

[jgliss]

Looks good :)