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

Update CI environment lockfiles #4137

Merged
merged 2 commits into from
Jun 2, 2021
Merged

Update CI environment lockfiles #4137

merged 2 commits into from
Jun 2, 2021

Conversation

github-actions[bot]
Copy link
Contributor

Lockfiles updated to the latest resolvable environment.

@rcomer
Copy link
Member

rcomer commented May 15, 2021

Oh dear, we may have to blame the new cf-units devs for these failures 😬. I don’t understand how though, as those changes were supposed to reinstate old behaviour. And why is py38 different?

@rcomer
Copy link
Member

rcomer commented May 15, 2021

Aha! #3687 explains why previous behaviour != historical behaviour.

@rcomer
Copy link
Member

rcomer commented May 15, 2021

py38 is still getting a cftime._cftime.real_datetime instance from num2date. I've no idea why that should be different from py36 and py37.

@jamesp
Copy link
Member

jamesp commented May 17, 2021

Hmm, why has cython become a dependency? It wasn't in the previous build.

@trexfeathers
Copy link
Contributor

Hmm, why has cython become a dependency? It wasn't in the previous build.

It was introduced for cf-units in v2.1.4 (conda-forge/cf_units-feedstock#32), so AFAICT it should have already propagated up to Iris before now?

@jamesp
Copy link
Member

jamesp commented May 17, 2021

I would have thought that would only be a build dependency, not required to run cf-units

@trexfeathers
Copy link
Contributor

Ah, yes, thanks. Didn't spot that fine distinction. Does that suggest one of the other changed dependencies has brought cython with it?

@jamesp
Copy link
Member

jamesp commented May 17, 2021

Very odd, I'm not sure. I have a script somewhere that can read a lock file and tell you want depends on what. I'll dust it off and see if I can run it over this new version

@github-actions github-actions bot force-pushed the auto-update-lockfiles branch from 036fc16 to 81ecec3 Compare May 22, 2021 01:09
@rcomer
Copy link
Member

rcomer commented May 24, 2021

It seems the latest update has clobbered the commit from #4139

@trexfeathers
Copy link
Contributor

@bjlittle informs me that cython is coming from python-stratify.

@bjlittle
Copy link
Member

bjlittle commented Jun 1, 2021

@jamesp python-stratify <0.2 will pull in cython as a runtime dependency. I fixed this as part of the recent 0.2.post0 release.

conda-lock has resolved against python-stratify 0.1.1 ... which will indeed be a source for pulling in cython.

If this is a problem, can you re-run to get the latest and greatest?

@github-actions github-actions bot force-pushed the auto-update-lockfiles branch from 7178e45 to 84e5160 Compare June 2, 2021 08:00
@SciTools-assistant SciTools-assistant added the Blocked: CLA needed See https://scitools.org.uk. Submit the form at: https://scitools.org.uk/cla/v4/form label Jun 2, 2021
@jamesp
Copy link
Member

jamesp commented Jun 2, 2021

Ok, since #4163 has now gone in this is only resolving py37 and py38 environments which is great. But now we're seeing inconsistencies between handling dayofwk between python 3.7 and 3.8... @trexfeathers any ideas why this might be?

@trexfeathers
Copy link
Contributor

But now we're seeing inconsistencies between handling dayofwk between python 3.7 and 3.8... @trexfeathers any ideas why this might be?

It sounds related to cftime, but I don't know why there would be different behaviours between Python versions.

@jamesp
Copy link
Member

jamesp commented Jun 2, 2021

Here's the diff between the two lock files

PACKAGE                        PY37          PY38
==================             ========      =========
cython                         0.29.23
importlib_metadata             4.4.0
python                         3.7.10        3.8.10
python-stratify                0.1.1         0.2.post0
python_abi                     3.7           3.8

Strange that the py37 is still using the old python-stratify

@trexfeathers
Copy link
Contributor

But now we're seeing inconsistencies between handling dayofwk between python 3.7 and 3.8... @trexfeathers any ideas why this might be?

@jamesp see #4169.

@SciTools-assistant SciTools-assistant removed the Blocked: CLA needed See https://scitools.org.uk. Submit the form at: https://scitools.org.uk/cla/v4/form label Jun 2, 2021
@jamesp
Copy link
Member

jamesp commented Jun 2, 2021

@trexfeathers @rcomer either of you want the honours of merging this?

@rcomer
Copy link
Member

rcomer commented Jun 2, 2021

want the honours of merging this?

👀 🎉

@rcomer rcomer merged commit 83cc580 into master Jun 2, 2021
@jamesp jamesp deleted the auto-update-lockfiles branch June 2, 2021 16:35
tkknight added a commit to tkknight/iris that referenced this pull request Jun 4, 2021
* master:
  refactor setup.py to setup.cfg (SciTools#4168)
  update docs pypi release (SciTools#4173)
  Update CI environment lockfiles (SciTools#4137)
  update CONTRIBUTING.md (SciTools#4165)
  RTD support link update (SciTools#4166)
  drop py36 support (SciTools#4163)
  github issues contact link for discussions (SciTools#4164)
  Bump black version (SciTools#4162)
  Stop CI from clobbering commits on lockfile updates (SciTools#4157)
  [pre-commit.ci] pre-commit autoupdate (SciTools#4161)
  Add a method to return a CubeList from CubeList.copy() (SciTools#4094)
  Update black et al (SciTools#4155)
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.

6 participants