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

Soft import #9561

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Soft import #9561

wants to merge 9 commits into from
+170 −82

Commits on Sep 30, 2024

  1. ENH, TST: aux func for importing optional deps

    @scott-huberty
    scott-huberty committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    357341d View commit details
    Browse the repository at this point in the history

  2. ENH: use our new helper func for importing optional deps

    @scott-huberty
    scott-huberty committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    039a7b1 View commit details
    Browse the repository at this point in the history

  3. FIX: use aux func for a few more cftime imports

    @scott-huberty
    scott-huberty committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    8cf4ab6 View commit details
    Browse the repository at this point in the history

  4. FIX: remove cruft....

    @scott-huberty
    scott-huberty committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    bcba465 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. Merge remote-tracking branch 'upstream/main' into soft_import 

    resolved conflict stemming from pydata#9505 by accepting this branches changes (pydata#9505 was just a slight edit on the old try import .. except pattern)
    @scott-huberty
    scott-huberty committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    3c5d35d View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2024

  1. FIX: Make it play well with mypy 

    Per the proposal at pydata#9561 (comment)

This pairs any use of (a now simplified) `attempt_import` with a direct import of the same module, guarded by an `if TYPE_CHECKING` block.
    @scott-huberty
    scott-huberty committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    12ee425 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/main' into soft_import 

    I was able resolve the conflicts in the listed files below by accepting a combination of the changes from the main branch and this PR. Basically just stacked the changes that were recently merged to main with the changed in this PR. I did not modify the content of the changes from main at all.
    @scott-huberty
    scott-huberty committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    4df451c View commit details
    Browse the repository at this point in the history

  3. FIX, TST: match error

    @scott-huberty
    scott-huberty committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    bcbde38 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2024

  1. Update xarray/tests/test_utils.py 

    Co-authored-by: Michael Niklas  <[email protected]>
    @dcherian @headtr1ck
    dcherian and headtr1ck authored Nov 14, 2024
    Configuration menu
    Copy the full SHA
    d13cba7 View commit details
    Browse the repository at this point in the history