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.

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

Numpy rounding fix #3758

Merged
merged 3 commits into from
Jul 23, 2020
Merged

Numpy rounding fix #3758

merged 3 commits into from
Jul 23, 2020

Conversation

stephenworsley
Copy link
Contributor

As mentioned in #3757, there is a test currently failing due to a number being rounded to an int rather than a float. It turns out this is not due to a change in cftime as previously thought, but due to a change in numpy.
Matplotlib is also being pinned here to get a separate test to pass.

@bjlittle bjlittle self-assigned this Jul 23, 2020
@bjlittle bjlittle modified the milestones: v2.3.0, v3.0.0 Jul 23, 2020
@bjlittle
Copy link
Member

Awesome thanks @stephenworsley

bjlittle
bjlittle reviewed Jul 23, 2020
View reviewed changes
requirements/core.txt
@@ -8,7 +8,7 @@ cartopy>=0.12
cf-units>=2
cftime==1.1.3
dask[array]>=2 #conda: dask>=2
matplotlib
matplotlib<3.3
Copy link
Member

@bjlittle bjlittle Jul 23, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@stephenworsley Happy with the temporary pin here, and we can address these test failures separately

@bjlittle bjlittle merged commit 70307ae into SciTools:master Jul 23, 2020
@bjlittle bjlittle mentioned this pull request Jul 23, 2020
Closed
tkknight added a commit to tkknight/iris that referenced this pull request Jul 23, 2020
@tkknight
Merge branch 'master' into move_orca_plot_in_gallery
734cec6 
* master:
  flake8 outstanding files (SciTools#3755)
  Numpy rounding fix (SciTools#3758)
@tkknight tkknight mentioned this pull request Jul 23, 2020
Closed
tkknight added a commit to tkknight/iris that referenced this pull request Jul 26, 2020
@tkknight
Merge branch 'pin_for_temp_fix_for_readthedocs' into enable_pdf_creation
d7249e4 
* pin_for_temp_fix_for_readthedocs:
  pin matplotlib<3.3
  moved to oceanography section of gallery (SciTools#3761)
  unpin cftime (SciTools#3757)
  flake8 outstanding files (SciTools#3755)
  Numpy rounding fix (SciTools#3758)
tkknight added a commit to tkknight/iris that referenced this pull request Jul 30, 2020
@tkknight
Merge branch 'master' into gallery_code_consistency
89f2ef2 
* master:
  pin matplotlib<3.3 (SciTools#3763)
  moved to oceanography section of gallery (SciTools#3761)
  unpin cftime (SciTools#3757)
  flake8 outstanding files (SciTools#3755)
  Numpy rounding fix (SciTools#3758)
@bjlittle bjlittle mentioned this pull request Aug 5, 2020
Merged
20 tasks
bjlittle pushed a commit to bjlittle/iris that referenced this pull request Aug 5, 2020
@stephenworsley @bjlittle
Numpy rounding fix (SciTools#3758)
d56650d 
ensure rounding is numpy like (maintains type)
abooton pushed a commit that referenced this pull request Aug 13, 2020
@bjlittle @stephenworsley
[FB] [PI-3478] Lenient cube arithmetic (#3774)
0e15178 
* initial cube arithmetic

* support in-place cube resolve

* fix non in-place broadcasting

* remove temporary resolve scenario test

* lenient/strict support for attributes dicts with numpy arrays

* lenient/strict treatment of scalar coordinates

* strict points/bounds matching

* lenient/strict prepare local dim/aux/scalar coordinates

* support extended broadcasting

* always raise exception on points/bounds mismatch

* ignore scalar points/bounds mismatches, lenient only

* remove todos

* tidy logger debugs

* qualify src/tgt cube references in debug

* Numpy rounding fix (#3758)

ensure rounding is numpy like (maintains type)

* avoid unittest.mock.sentinel copy issue

* fast load np.int32

* fix cube maths doctest

* fix iris.common.resolve logging configuration

* fix prepare points/bounds + extra metadata cml

* support mapping reversal based on free dims

* var_name fix for lenient equality

* add support for DimCoordMetadata

* fix circular flag + support CoordMetadata and DimCoordMetadata exchange

* fix circular issue for concatenate DimCoord->AuxCoord demotion

* fix concatenate._CubeSignature sorted

* minor tweaks

* keep lenient_client private in maths

* tidy maths

* tidy iris.analysis.maths.IFunc

* refactor IFunc test

* polish in-place support

* tidy metadata_resolve

Co-authored-by: stephenworsley <49274989+stephenworsley@users.noreply.github.com>
bjlittle added a commit to bjlittle/iris that referenced this pull request Aug 14, 2020
@bjlittle @stephenworsley
[FB] [PI-3478] Lenient cube arithmetic (SciTools#3774)
599fa11 
* initial cube arithmetic

* support in-place cube resolve

* fix non in-place broadcasting

* remove temporary resolve scenario test

* lenient/strict support for attributes dicts with numpy arrays

* lenient/strict treatment of scalar coordinates

* strict points/bounds matching

* lenient/strict prepare local dim/aux/scalar coordinates

* support extended broadcasting

* always raise exception on points/bounds mismatch

* ignore scalar points/bounds mismatches, lenient only

* remove todos

* tidy logger debugs

* qualify src/tgt cube references in debug

* Numpy rounding fix (SciTools#3758)

ensure rounding is numpy like (maintains type)

* avoid unittest.mock.sentinel copy issue

* fast load np.int32

* fix cube maths doctest

* fix iris.common.resolve logging configuration

* fix prepare points/bounds + extra metadata cml

* support mapping reversal based on free dims

* var_name fix for lenient equality

* add support for DimCoordMetadata

* fix circular flag + support CoordMetadata and DimCoordMetadata exchange

* fix circular issue for concatenate DimCoord->AuxCoord demotion

* fix concatenate._CubeSignature sorted

* minor tweaks

* keep lenient_client private in maths

* tidy maths

* tidy iris.analysis.maths.IFunc

* refactor IFunc test

* polish in-place support

* tidy metadata_resolve

Co-authored-by: stephenworsley <49274989+stephenworsley@users.noreply.github.com>
abooton pushed a commit that referenced this pull request Aug 14, 2020
@bjlittle @lbdreyer
@pp-mo @trexfeathers @stephenworsley
[PI-3478] Merge cube arithmetic feature branch (#3785)
556e71e 
* PI-3478: Common metadata API (#3583)

* common metadata api

* rationalise _cube_coord_common into common

* move state into metadata

* MetadataFactory test coverage

* temporarily pin back iris-grib

* test coverage for iris.common.metadata._BaseMeta

* test coverage for iris.common.mixin.LimitedAttributeDict

* remove temporary iris-grib pin

* review actions

* Update lib/iris/tests/unit/common/metadata/test_BaseMetadata.py

Co-Authored-By: lbdreyer <lbdreyer@users.noreply.github.com>

* [FB] [PI-3478] Lenient metadata (#3739)

* add lenient infra-structure

* add metadata lenient __eq__ support

* complete __eq__, combine and difference support

* explicit inherited lenient_service + support equal convenience

* fix attributes difference + lenient kwargs

* make lenient public + minor tidy

* rename MetadataManagerFactory to metadata_manager_factory

* extend lenient_client decorator to support services registration

* add lenient test coverage

* purge qualname usage in metadata.py

* support global enable for lenient services

* support partial mapping metadata assignment

* purge Lenient.__setattr__ from api

* add BaseMetadata compare test coverage

* metadata rationalisation

* add BaseMetadata difference test coverage

* added context manager ephemeral comment clarification

* add BaseMetadata __ne__ test coverage

* standardise lenient decorator closure names

* add BaseMetadata equal test coverage

* half dunder context

* add AncillaryVariableMetadata test coverage

* add additional AncillaryVariableMetadata test coverage

* add CellMeasureMetadata test coverage

* Clarify lenient_service operation + simplify code.

* add CoordMetadata test coverage

* add CubeMetadata test coverage

* metadata tests use self.cls

* fix typo

* fix context manager ephemeral services

* add logging

* Pin pillow to make graphics tests work again. (#3630)

* Fixed tests since Numpy 1.18 deprecation of non-int num arguments for linspace. (#3655)

* Switched use of datetime.weekday() to datetime.dayofwk. (#3687)

* New image hashes for mpl 3x2 (#3682)

* New image hash for iris.test.test_plot.TestSymbols.test_cloud_cover with matplotlib 3.2.0.

* Further images changes for mpl3x2.

* Yet more updated image results.

* fix sentinel uniqueness test failure

* remove redundant cdm mapping test

* difference returns None for no difference

* protect Lenient and LENIENT private

* privitise lenient framework and add API veneer

* add explicit maths feature default

* review actions

* review actions

* trexfeathers review actions

* stephenworsley review actions

Co-authored-by: Patrick Peglar <patrick.peglar@metoffice.gov.uk>
Co-authored-by: Martin Yeo <40734014+trexfeathers@users.noreply.github.com>

* [FB] [PI-3478] Lenient cube arithmetic (#3774)

* initial cube arithmetic

* support in-place cube resolve

* fix non in-place broadcasting

* remove temporary resolve scenario test

* lenient/strict support for attributes dicts with numpy arrays

* lenient/strict treatment of scalar coordinates

* strict points/bounds matching

* lenient/strict prepare local dim/aux/scalar coordinates

* support extended broadcasting

* always raise exception on points/bounds mismatch

* ignore scalar points/bounds mismatches, lenient only

* remove todos

* tidy logger debugs

* qualify src/tgt cube references in debug

* Numpy rounding fix (#3758)

ensure rounding is numpy like (maintains type)

* avoid unittest.mock.sentinel copy issue

* fast load np.int32

* fix cube maths doctest

* fix iris.common.resolve logging configuration

* fix prepare points/bounds + extra metadata cml

* support mapping reversal based on free dims

* var_name fix for lenient equality

* add support for DimCoordMetadata

* fix circular flag + support CoordMetadata and DimCoordMetadata exchange

* fix circular issue for concatenate DimCoord->AuxCoord demotion

* fix concatenate._CubeSignature sorted

* minor tweaks

* keep lenient_client private in maths

* tidy maths

* tidy iris.analysis.maths.IFunc

* refactor IFunc test

* polish in-place support

* tidy metadata_resolve

Co-authored-by: stephenworsley <49274989+stephenworsley@users.noreply.github.com>

* rebase master fix-up for cube arithmetic

* add missing new dependency to readthedocs.yml requirements

Co-authored-by: lbdreyer <lbdreyer@users.noreply.github.com>
Co-authored-by: Patrick Peglar <patrick.peglar@metoffice.gov.uk>
Co-authored-by: Martin Yeo <40734014+trexfeathers@users.noreply.github.com>
Co-authored-by: stephenworsley <49274989+stephenworsley@users.noreply.github.com>
tkknight added a commit to tkknight/iris that referenced this pull request Aug 15, 2020
@tkknight
Merge branch 'master' into contribution_overhaul
13de816 
* master:
  remove duplicate whats new entries from the last release (SciTools#3773)
  whatsnew latest update (SciTools#3771)
  whatsnew overhaul (SciTools#3769)
  Gallery code consistency (SciTools#3766)
  enabled pdf creation (SciTools#3765)
  pin matplotlib<3.3 (SciTools#3763)
  moved to oceanography section of gallery (SciTools#3761)
  unpin cftime (SciTools#3757)
  flake8 outstanding files (SciTools#3755)
  Numpy rounding fix (SciTools#3758)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjlittle bjlittle bjlittle left review comments

Assignees

@bjlittle bjlittle

Labels
Type: Enhancement
Projects
None yet
Milestone
v3.0.0
Development

Successfully merging this pull request may close these issues.
2 participants
@stephenworsley @bjlittle