Skip to content

[FB] Resolve conflicts with imagehash in requirements/test.txt #3735

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.

Sign up for GitHub

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

Jump to bottom
Merged
pp-mo merged 1 commit into from
Jun 10, 2020
Merged

[FB] Resolve conflicts with imagehash in requirements/test.txt #3735

pp-mo merged 1 commit into from
Jun 10, 2020

Conversation

@abooton
Copy link
Contributor

@abooton abooton commented Jun 10, 2020

Cherry-pick commit 3b4a00d, in which pillow was pinned.
This resolves conflicts when merging into master.

@abooton abooton changed the title Resolve conflicts with requirements/test.txt to update the imagehash … [FB] Resolve conflicts with requirements/test.txt to update the imagehash … Jun 10, 2020
@abooton abooton added this to the v3.0.0 milestone Jun 10, 2020
@abooton abooton changed the title [FB] Resolve conflicts with requirements/test.txt to update the imagehash … [FB] Resolve conflicts with imagehash in requirements/test.txt Jun 10, 2020
@pp-mo pp-mo merged commit e34eb20 into SciTools:launch_ancils_mergebase738093f Jun 10, 2020
@abooton abooton deleted the launch_ancils_resolve_imagehash_pin_conflict branch June 10, 2020 15:14
stephenworsley added a commit to stephenworsley/iris that referenced this pull request Aug 20, 2020
@stephenworsley
Merge branch 'launch_ancils' of https://github.com/SciTools/iris into…
a163799 
… launch_ancils

* 'launch_ancils' of https://github.com/SciTools/iris:
  Resolve conflicts with requirements/test.txt to update the imagehash pin to imagehash>=4.0 (SciTools#3735)
  PI:3358 (WIP) Ensure flags load/save without units (SciTools#3613)
  PI-3473 Rename "engine.provides" (SciTools#3590)
  PI-3473: Whatsnews relating to ancillary load + save. (SciTools#3557)
  PI-3473: Netcdf loading ancillary variables (SciTools#3556)

� Conflicts:
�	lib/iris/fileformats/netcdf.py
�	lib/iris/tests/unit/fileformats/netcdf/test__load_aux_factory.py
�	requirements/core.txt
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

v3.0.0

Development

Successfully merging this pull request may close these issues.

2 participants

@abooton @pp-mo