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 2.0 + scipy + matplotlib pre-release workflow #89

Merged
merged 37 commits into from
Apr 25, 2024
Merged

Numpy 2.0 + scipy + matplotlib pre-release workflow #89

merged 37 commits into from
Apr 25, 2024

Commits on Mar 12, 2024

  1. pin pytest to 8.0 and above

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    498bb7d View commit details
    Browse the repository at this point in the history

  2. move conftest.py to root and turn warnings into errors

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    8869fa3 View commit details
    Browse the repository at this point in the history

  3. add workflow testing against numpy 2.0

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    e6bdb87 View commit details
    Browse the repository at this point in the history

  4. skip coverage

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    c6421cf View commit details
    Browse the repository at this point in the history

  5. fix config file used

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    b9f812b View commit details
    Browse the repository at this point in the history

  6. also install pip-pre scipy and matplotlib

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    133eb37 View commit details
    Browse the repository at this point in the history

  7. scikit-learn also for nilearn compatibility with numpy 2.0

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    d359e64 View commit details
    Browse the repository at this point in the history

  8. don't run nilearn tests on pip-pre

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    3e4848c View commit details
    Browse the repository at this point in the history

  9. run 3.9 and 3.12 on circle and 3.7 compat on gh

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    7174d55 View commit details
    Browse the repository at this point in the history

  10. fix workflow name

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    57bf4d2 View commit details
    Browse the repository at this point in the history

  11. fix: importorskip is not a mark decorator

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    c051918 View commit details
    Browse the repository at this point in the history

  12. catch user warning

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    e9f8638 View commit details
    Browse the repository at this point in the history

  13. fix deprecated readfp

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    5823b76 View commit details
    Browse the repository at this point in the history

  14. [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 Mar 12, 2024
    Configuration menu
    Copy the full SHA
    f28ebc3 View commit details
    Browse the repository at this point in the history

  15. ignore conftest in module discovery

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    861e6ac View commit details
    Browse the repository at this point in the history

  16. fix uninstall step of nilearn

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    fdfd6a3 View commit details
    Browse the repository at this point in the history

  17. try again to rm nilearn

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    969a2bd View commit details
    Browse the repository at this point in the history

  18. fix module discovery logic

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    8cf1d75 View commit details
    Browse the repository at this point in the history

  19. fix numpy deprecation of np.NINF and np.trapz

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    06cb94a View commit details
    Browse the repository at this point in the history

  20. fix missed importorskip("nilearn")

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    b0bba37 View commit details
    Browse the repository at this point in the history

  21. fix deprecation of find_module in module discovery logic

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    1298196 View commit details
    Browse the repository at this point in the history

  22. fix compatibility trapz <-> trapezoid

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    b5008f1 View commit details
    Browse the repository at this point in the history

  23. fix compatibility function

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    45cc318 View commit details
    Browse the repository at this point in the history

  24. add missed pytest.importorskip("nilearn")

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    530ee74 View commit details
    Browse the repository at this point in the history

  25. fix imports, drop pkg_utils entirely

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    7d33193 View commit details
    Browse the repository at this point in the history

  26. fix missed imports

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    4c59098 View commit details
    Browse the repository at this point in the history

  27. rm unused variable

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    ac48dac View commit details
    Browse the repository at this point in the history

  28. use relative imports and fix circular import and namespace

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    af4d907 View commit details
    Browse the repository at this point in the history

  29. revert version import

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    d632133 View commit details
    Browse the repository at this point in the history

  30. close log file handler

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    34ed758 View commit details
    Browse the repository at this point in the history

  31. [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 Mar 12, 2024
    Configuration menu
    Copy the full SHA
    fda9324 View commit details
    Browse the repository at this point in the history

  32. fix missed importorskip("nilearn")

    @mscheltienne
    mscheltienne committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    ec85fb8 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. fix codecov yml

    @mscheltienne
    mscheltienne committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    8ef7bbc View commit details
    Browse the repository at this point in the history

  2. suppress sphinx gallery warning

    @mscheltienne
    mscheltienne committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    b55bc0c View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. mv trapezoid_compat

    @mscheltienne
    mscheltienne committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    114ae4f View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into np2.0

    @mscheltienne
    mscheltienne committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    a40f270 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. trigger ci

    @mscheltienne
    mscheltienne committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    493756d View commit details
    Browse the repository at this point in the history