8000 Comparing main...v3.4.x · SciTools/iris · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: SciTools/iris
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: SciTools/iris
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.4.x
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 10 commits
  • 55 files changed
  • 8 contributors

Commits on Dec 16, 2022

  1. Correct heading for v3.4 release highlights. (#5110) (#5112) 

    * Correct heading for v3.4 release highlights.

* Include patch number in release highlights heading.

Co-authored-by: lbdreyer <lbdreyer@users.noreply.github.com>

Co-authored-by: lbdreyer <lbdreyer@users.noreply.github.com>

Co-authored-by: lbdreyer <lbdreyer@users.noreply.github.com>
    @trexfeathers @lbdreyer
    trexfeathers and lbdreyer authored Dec 16, 2022
    Configuration menu
    Copy the full SHA
    1580da2 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2023

  1. NetCDF thread safety take two (#5095), and resolving conflicts. 

    * Unpin netcdf4.

* Temporarily enable GHA on this branch.

* Temporarily enable GHA on this branch.

* Temporarily enable GHA on this branch.

* Experiment to disable wheel CI on forks.

* Disable segfaulting routines.

* More temporary changes to get CI passing.

* More temporary changes to get CI passing.

* Finessed segfault skipping.

* Bring in changed from #5061.

* Re-instate test_load_laea_grid.

* Adaptations to get the tests passing.

* Use typing.Mapping instead.

* Get doctests passing.

* CF only resolve non-url filenames.

* Confirm thread safety fixes.

* Remove dummy assignment.

* Restored plot_nemo What's New entry.

* _add_aux_factories temporarily release global lock.

* Remove per-file locking.

* Remove remaining test workarounds.

* Remove remaining comments.

* Correct use of CFReader context manager.

* Refactor for easier future maintenance.

* Rename netcdf _thread_safe, add header.

* Full use of ThreadSafeAggregators.

* Full use of ThreadSafeAggregators.

* Remove remaining imports of NetCDF4.

* Test to ensure netCDF4 is via _thread_safe module.

* More refined netcdf._thread_safe classes.

* _thread_safe docstrings.

* Restore original NetCDF code where possible.

* Revert changes to 2.3.rst.

* Update lockfiles.

* Additions to _thread_safe.py

* Remove temporary CI shims.

* New locking stategy for NetCDFDataProxy.

* NetCDFDataProxy simpler use of netCDF4 lock.

* Update lock files.

* Go back to using a Threading Lock.

* Remove superfluous pass commands in test_cf.py.

* Rename _thread_safe to _thread_safe_nc.

* Rename thread safe classes to be 'Wrappers'.

* Better contained getattr and setattr pattern.

* Explicitly name netCDF4 module in _thread_safe_nc docstring.

* Better docstring for _ThreadSafeWrapper.

* Better comment about THREAD_SAFE_FLAG.

* list() wrapping within _GLOBAL_NETCDF4_LOCK, to account for generators.

* More accurate thread_safe docstrings in netcdf.saver.

* Split netcdf integration tests into multiple modules.

* Tests for non-thread-safe NetCDF behaviour.

* Docstring accuracy.

* Correct use of dask config set (context manager).

* Update dependencies.

* Review - don't need the first-class import of iris.tests.

* Better name for the loading test.

* Better selection of data to load.

* What's New entry.

* Improve tests.

* Update lock files.

* Increase chunking on test_save.

---------

Co-authored-by: Patrick Peglar <patrick.peglar@metoffice.gov.uk>
    @trexfeathers @pp-mo
    trexfeathers and pp-mo committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    d064032 View commit details
    Browse the repository at this point in the history

  2. Update lockfiles.

    @trexfeathers
    trexfeathers committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    9a1e7a3 View commit details
    Browse the repository at this point in the history

  3. Whats new updates for v3.4.1 .

    @trexfeathers
    trexfeathers committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    34919b1 View commit details
    Browse the repository at this point in the history

  4. Replace apparently retired UDUNITS documentation link. (#5153)

    @trexfeathers
    trexfeathers committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    33fc760 View commit details
    Browse the repository at this point in the history

  5. Update lock files and accompanying fixes. (#5132), and resolving conf… 

    …licts.

* Updated environment lockfiles

* Use set_ylim for test_2d_coord_bounds_platecarree.

* Don't use np.float for maths tests.

* Remove uses of np.int .

Co-authored-by: Lockfile bot <noreply@github.com>
    @trexfeathers @web-flow
    trexfeathers and web-flow committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    580bbc7 View commit details
    Browse the repository at this point in the history

  6. [pre-commit.ci] pre-commit autoupdate (#5143) 

    updates:
- [github.com/pycqa/isort: 5.11.4 → 5.12.0](PyCQA/isort@5.11.4...5.12.0)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
    @pre-commit-ci @trexfeathers
    pre-commit-ci[bot] authored and trexfeathers committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    c9881ee View commit details
    Browse the repository at this point in the history

  7. Fix plot_atlantic_profiles Flake8 E741 ambiguous variable name. (#5087)

    @trexfeathers
    trexfeathers committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    c5da467 View commit details
    Browse the repository at this point in the history

  8. pip pin for sphinx<5 (#5122)

    @bjlittle @trexfeathers
    bjlittle authored and trexfeathers committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    7b007ec View commit details
    Browse the repository at this point in the history

  9. Merge pull request #5169 from trexfeathers/patch_341 

    NetCDF thread safety for `v3.4.1` patch release
    @stephenworsley
    stephenworsley authored Feb 21, 2023
    Configuration menu
    Copy the full SHA
    bc73f17 View commit details
    Browse the repository at this point in the history
Loading
0