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

Update InVEST to build against numpy 2 #1642

Merged
merged 33 commits into from
Oct 16, 2024
Merged

Update InVEST to build against numpy 2 #1642

merged 33 commits into from
Oct 16, 2024

Commits on Oct 8, 2024

  1. Removing numpy version cap that prevented numpy 2 installation. RE:na… 

    …tcap#1641
    @phargogh
    phargogh committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    0ff560b View commit details
    Browse the repository at this point in the history

  2. Adding note to HISTORY. RE#1641

    @phargogh
    phargogh committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    5e7df94 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into task/1641-update-for-numpy-2

    @phargogh
    phargogh authored Oct 8, 2024
    Configuration menu
    Copy the full SHA
    a96fb1b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' of https://github.com/natcap/invest into task/164… 

    …1-update-for-numpy-2

Conflicts:
        HISTORY.rst
    @phargogh
    phargogh committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    e1a7021 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'task/1641-update-for-numpy-2' of github.com:phargogh/in… 

    …vest into task/1641-update-for-numpy-2
    @phargogh
    phargogh committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    5117e79 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. Trying to lfs-checkout to the right revision. RE:natcap#1641

    @phargogh
    phargogh committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    670cb7d View commit details
    Browse the repository at this point in the history

  2. Printing the subwatersheds vector for debugging. RE:natcap#1641

    @phargogh
    phargogh committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    56eb76d View commit details
    Browse the repository at this point in the history

  3. Attempting to read the binary file before printing. RE:natcap#1641

    @phargogh
    phargogh committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    595db95 View commit details
    Browse the repository at this point in the history

  4. Restoring autovalidate script to its prior state. RE:natcap#1641

    @phargogh
    phargogh committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    3c12306 View commit details
    Browse the repository at this point in the history

  5. Capping GDAL to less than 3.9 to see if that fixes the weird opening … 

    …issues. RE:natcap#1641
    @phargogh
    phargogh committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    5d42450 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' of https://github.com/natcap/invest into task/164… 

    …1-update-for-numpy-2
    @phargogh
    phargogh committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    873e780 View commit details
    Browse the repository at this point in the history

  7. Capping the gdal version as an experiment. RE:natcap#1641

    @phargogh
    phargogh committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    e550127 View commit details
    Browse the repository at this point in the history

  8. Double-checking paths are as we expect them

    @phargogh
    phargogh committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    632d9ba View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2024

  1. Using logging to record debug info. RE:natcap#1641

    @phargogh
    phargogh committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    82d81ab View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. Merge branch 'main' of https://github.com/natcap/invest into task/164… 

    …1-update-for-numpy-2

Conflicts:
	HISTORY.rst
    @phargogh
    phargogh committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    8ee5f80 View commit details
    Browse the repository at this point in the history

  2. Handling numpy 2 build requirements in pyproject.toml. RE:natcap#1641

    @phargogh
    phargogh committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    c28041c View commit details
    Browse the repository at this point in the history

  3. Correcting a toml syntax issue. RE:natcap#1641

    @phargogh
    phargogh committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    e7c7c1a View commit details
    Browse the repository at this point in the history

  4. Bumping the UG repo rev for RST syntax. 

    An RST error in a footnote in Wave Energy was breaking the binary builds
in the main InVEST repository.  This is now addressed. RE:natcap#1641
    @phargogh
    phargogh committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    dc63302 View commit details
    Browse the repository at this point in the history

  5. Adding a numpy>2 constraint for testing our builds. RE:natcap#1641

    @phargogh
    phargogh committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    e711300 View commit details
    Browse the repository at this point in the history

  6. Removing the GDAL upper bound for numpy2 compatibility. RE:natcap#1641

    @phargogh
    phargogh committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    f229373 View commit details
    Browse the repository at this point in the history

  7. Removing a no-longer-needed GDAL constraint. RE:natcap#1641

    @phargogh
    phargogh committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    9fdb381 View commit details
    Browse the repository at this point in the history

  8. Removing numpy>2 constraint so that environments will resolve on pyth… 

    …on 3.8. RE:natcap#1641
    @phargogh
    phargogh committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    b49dea2 View commit details
    Browse the repository at this point in the history

  9. Converting numpy.in1d to numpy.isin for numpy2 compatibility. RE:natc… 

    …ap#1641
    @phargogh
    phargogh committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    206c8f0 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. Updating UFRM for numpy2 compatibility. 

    RE:natcap#1641
    @phargogh
    phargogh committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    a43131a View commit details
    Browse the repository at this point in the history

  2. Updating UCM tests for numerical outputs. 

    The numpy2 update was producing slightly different numerical outputs,
but also we weren't asserting that they were numerically close, just
that they had the same number of digits after the decimal ... which
wasn't working well because most of these values were large.

RE:natcap#1641
    @phargogh
    phargogh committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    98904f3 View commit details
    Browse the repository at this point in the history

  3. Fixing an exception related to numpy types. 

    This is part of the numpy2 migration. RE:natcap#1641
    @phargogh
    phargogh committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    8f13be5 View commit details
    Browse the repository at this point in the history

  4. Converting numpy types to python types for numpy2. 

    RE:natcap#1641
    @phargogh
    phargogh committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    41fcb64 View commit details
    Browse the repository at this point in the history

  5. Converting types for numpy2 migration. 

    RE:natcap#1641
    @phargogh
    phargogh committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    b250662 View commit details
    Browse the repository at this point in the history

  6. Updating FCEE for numpy2 compatibility. 

    RE:natcap#1641
    @phargogh
    phargogh committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    ab90c46 View commit details
    Browse the repository at this point in the history

  7. Using assert_allclose for better numerical comparisons. 

    RE:natcap#1641
    @phargogh
    phargogh committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    63fb888 View commit details
    Browse the repository at this point in the history

  8. Cleaning up misc. code from debugging. RE:natcap#1641

    @phargogh
    phargogh committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    292c3e2 View commit details
    Browse the repository at this point in the history

  9. Removing code left over from debugging. 

    RE:natcap#1641
    @phargogh
    phargogh committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    89d236b View commit details
    Browse the repository at this point in the history

  10. Clarifying intent in pyproject.toml 

    RE:natcap#1641
    @phargogh
    phargogh committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    75107e7 View commit details
    Browse the repository at this point in the history