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

Shapefile masking #5470

Merged
merged 58 commits into from
Feb 13, 2024
Merged

Shapefile masking #5470

merged 58 commits into from
Feb 13, 2024

Commits on Sep 1, 2023

  1. Working draft of shapefile masking

    @acchamber
    acchamber committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    3b15cd2 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2023

  1. Version of shapefile masking with tests and ready for preliminary review

    @acchamber
    acchamber committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    2ef0d15 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2023

  1. Updated tests with proper paths and skip_tests decorator

    @acchamber
    acchamber committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    6d36d05 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2023

  1. Merge branch 'main' into shapefile_masking

    @acchamber
    acchamber authored Sep 7, 2023
    Configuration menu
    Copy the full SHA
    befb1e5 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2023

  1. Merge branch 'main' into shapefile_masking

    @acchamber
    acchamber authored Oct 2, 2023
    Configuration menu
    Copy the full SHA
    6c2ef62 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2023

  1. Merge branch 'main' into shapefile_masking

    @acchamber
    acchamber authored Nov 8, 2023
    Configuration menu
    Copy the full SHA
    7b28fcd View commit details
    Browse the repository at this point in the history

  2. fixed some paths and removed broken code

    @acchamber
    acchamber committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    6decedf View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2023

  1. Merge branch 'SciTools:main' into shapefile_masking

    @acchamber
    acchamber authored Nov 9, 2023
    Configuration menu
    Copy the full SHA
    d3b91d1 View commit details
    Browse the repository at this point in the history

  2. Added more tests and split into integration and unit tests. Testing w… 

    …arnings/errors aswell.
    @acchamber
    acchamber committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    d168f24 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'shapefile_masking' of https://github.com/acchamber/iris … 

    …into shapefile_masking

* 'shapefile_masking' of https://github.com/acchamber/iris:
  fixed spacing (SciTools#5572)
  DOCS: Removed broken git links. (SciTools#5569)
    @acchamber
    acchamber committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    4947ffb View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

  1. responces to comments on utils.py for shapefile masking

    @acchamber
    acchamber committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    1d05f63 View commit details
    Browse the repository at this point in the history

  2. tests actually pass now

    @acchamber
    acchamber committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    ca363cc View commit details
    Browse the repository at this point in the history

  3. Moved tests to correct locations and strted changes on _shapefiles.py

    @acchamber
    acchamber committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    23f3640 View commit details
    Browse the repository at this point in the history

  4. some changes to _shapefiles to match review

    @acchamber
    acchamber committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    57af617 View commit details
    Browse the repository at this point in the history

  5. added setUp cases to tests

    @acchamber
    acchamber committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    5ba0ebc View commit details
    Browse the repository at this point in the history

  6. moved test names to lower_case and added acknoledgment

    @acchamber
    acchamber committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    cce3f9b View commit details
    Browse the repository at this point in the history

  7. removed seperate guess_bounds function

    @acchamber
    acchamber committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    3ec7cc3 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. updated structure to properly call coord names/coords when optimal

    @acchamber
    acchamber committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    7baab21 View commit details
    Browse the repository at this point in the history

  2. sphnix improvements to docstring 

    Co-authored-by: Martin Yeo <[email protected]>
    @acchamber @trexfeathers
    acchamber and trexfeathers authored Nov 22, 2023
    Configuration menu
    Copy the full SHA
    c0aa728 View commit details
    Browse the repository at this point in the history

  3. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    44fe0cd View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2023

  1. commited dask map_blocks approach and some test improvements

    @acchamber
    acchamber committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    28fcd44 View commit details
    Browse the repository at this point in the history

  2. replaced bounds rebasing via modulus with vectorized version

    @acchamber
    acchamber committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    87cc28e View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2023

  1. Dask chunk control and some docstrings

    @acchamber
    acchamber committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    92d869f View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. Merge branch 'shapefile_masking' of https://github.com/acchamber/iris … 

    …into shapefile_masking

* 'shapefile_masking' of https://github.com/acchamber/iris:
  [pre-commit.ci] auto fixes from pre-commit.com hooks
  sphnix improvements to docstring
    @acchamber
    acchamber committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    4b38611 View commit details
    Browse the repository at this point in the history

  2. reverted behaviour of modulus function to ASCEND and switcher argumen… 

    …t order in utils
    @acchamber
    acchamber committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    befceeb View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. edied tests to work with flipped argument order

    @acchamber
    acchamber committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    e391e43 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2024

  1. Improved optimisation by reading shapely docs properly and just using… 

    … a dask.delayed call
    @acchamber
    acchamber committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    8b0e869 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2024

  1. Docstring updates and a 4d integration test

    @acchamber
    acchamber committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    194aabf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into shapefile_masking

    @trexfeathers
    trexfeathers authored Feb 6, 2024
    Configuration menu
    Copy the full SHA
    9521c2e View commit details
    Browse the repository at this point in the history

  3. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    e89634b View commit details
    Browse the repository at this point in the history

  4. Update lib/iris/_shapefiles.py 

    Co-authored-by: Martin Yeo <[email protected]>
    @acchamber @trexfeathers
    acchamber and trexfeathers authored Feb 6, 2024
    Configuration menu
    Copy the full SHA
    162bd45 View commit details
    Browse the repository at this point in the history

  5. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    07ab745 View commit details
    Browse the repository at this point in the history

  6. improving readability from martin

    @acchamber
    acchamber committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    e8a23b7 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'shapefile_masking' of https://github.com/acchamber/iris … 

    …into shapefile_masking

* 'shapefile_masking' of https://github.com/acchamber/iris: (102 commits)
  [pre-commit.ci] auto fixes from pre-commit.com hooks
  Update lib/iris/_shapefiles.py
  [pre-commit.ci] auto fixes from pre-commit.com hooks
  Numpydocs misc (SciTools#5728)
  Updated environment lockfiles (SciTools#5731)
  Bump codecov/codecov-action from 3 to 4 (SciTools#5727)
  DOCS: API docs ToC more levels (SciTools#5714)
  Bump scitools/workflows from 2024.01.0 to 2024.02.0 (SciTools#5726)
  DOCS: numpydocs 8 (SciTools#5722)
  DOCS: numpydocs 7 (SciTools#5720)
  DOCS: numpydocs 6 (SciTools#5718)
  fix docstring types and remove duplicate line. (SciTools#5719)
  Updated environment lockfiles (SciTools#5717)
  numpydocs (SciTools#5715)
  DOCS: numpydocs 4 (SciTools#5711)
  DOCS: Add ruff section to the dev guide docs (SciTools#5701)
  [pre-commit.ci] pre-commit autoupdate (SciTools#5709)
  Bump scitools/workflows from 2023.12.1 to 2024.01.0 (SciTools#5710)
  Faster trivial equality checks for coordinates and arrays (SciTools#5691)
  Make the Coord.cell method lazy (SciTools#5693)
  ...
    @acchamber
    acchamber committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    ea5be9c View commit details
    Browse the repository at this point in the history

  8. removed dask.delayed call

    @acchamber
    acchamber committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    64278ca View commit details
    Browse the repository at this point in the history

  9. Update lib/iris/_shapefiles.py 

    Co-authored-by: Martin Yeo <[email protected]>
    @acchamber @trexfeathers
    acchamber and trexfeathers authored Feb 6, 2024
    Configuration menu
    Copy the full SHA
    a46d7c9 View commit details
    Browse the repository at this point in the history

  10. Update lib/iris/_shapefiles.py 

    Co-authored-by: Martin Yeo <[email protected]>
    @acchamber @trexfeathers
    acchamber and trexfeathers authored Feb 6, 2024
    Configuration menu
    Copy the full SHA
    eca46c0 View commit details
    Browse the repository at this point in the history

  11. Update lib/iris/util.py 

    Co-authored-by: Martin Yeo <[email protected]>
    @acchamber @trexfeathers
    acchamber and trexfeathers authored Feb 6, 2024
    Configuration menu
    Copy the full SHA
    061b76b View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2024

  1. Added warning for possible mismatch of mask/cube coords

    @acchamber
    acchamber committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    cc6016b View commit details
    Browse the repository at this point in the history

  2. test for new warning

    @acchamber
    acchamber committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    5e7d799 View commit details
    Browse the repository at this point in the history

  3. added test

    @acchamber
    acchamber committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    440f049 View commit details
    Browse the repository at this point in the history

  4. Update lib/iris/_shapefiles.py 

    Co-authored-by: Martin Yeo <[email protected]>
    @acchamber @trexfeathers
    acchamber and trexfeathers authored Feb 7, 2024
    Configuration menu
    Copy the full SHA
    3c13e1b View commit details
    Browse the repository at this point in the history

  5. Added licenses

    @acchamber
    acchamber committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    1e1d711 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'shapefile_masking' of https://github.com/acchamber/iris … 

    …into shapefile_masking

* 'shapefile_masking' of https://github.com/acchamber/iris:
  Update lib/iris/_shapefiles.py
    @acchamber
    acchamber committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    22e2cf7 View commit details
    Browse the repository at this point in the history

  7. fixed doctest failures in example

    @acchamber
    acchamber committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    9cb96b9 View commit details
    Browse the repository at this point in the history

  8. Improved test coverage

    @acchamber
    acchamber committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    deb5ff9 View commit details
    Browse the repository at this point in the history

  9. fixed doctest

    @acchamber
    acchamber committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    6eaa36b View commit details
    Browse the repository at this point in the history

  10. doctest again

    @acchamber
    acchamber committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    3b7384f View commit details
    Browse the repository at this point in the history

  11. Docstring tidy up.

    @trexfeathers
    trexfeathers committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    a0aec74 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #1 from trexfeathers/docstring_tidy 

    Docstring tidy up
    @acchamber
    acchamber authored Feb 7, 2024
    Configuration menu
    Copy the full SHA
    e13e757 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2024

  1. fixed prime meridian bug

    @acchamber
    acchamber committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    b76dabd View commit details
    Browse the repository at this point in the history

  2. Update lib/iris/_shapefiles.py 

    Co-authored-by: Martin Yeo <[email protected]>
    @acchamber @trexfeathers
    acchamber and trexfeathers authored Feb 9, 2024
    Configuration menu
    Copy the full SHA
    ca380ed View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into shapefile_masking

    @acchamber
    acchamber authored Feb 9, 2024
    Configuration menu
    Copy the full SHA
    0518a40 View commit details
    Browse the repository at this point in the history

  4. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    404474f View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2024

  1. Added first draft of user guide page

    @acchamber
    acchamber committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    b924795 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2024

  1. Add What's New entry.

    @trexfeathers
    trexfeathers committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    4ab753a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from trexfeathers/shapefile_whatsnew 

    Add What's New entry for SciTools#5470
    @acchamber
    acchamber authored Feb 13, 2024
    Configuration menu
    Copy the full SHA
    84a8212 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'SciTools:main' into shapefile_masking

    @acchamber
    acchamber authored Feb 13, 2024
    Configuration menu
    Copy the full SHA
    bf3c720 View commit details
    Browse the repository at this point in the history