diff --git a/HISTORY.rst b/HISTORY.rst index bd145c7492..5a629e8a50 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -39,6 +39,8 @@ Unreleased Changes * General * Update python packaging settings to exclude a few config files and the workbench from source distributions and wheels + * Updating SDR test values due to an update in GDAL's mode resampling + algorithm. See https://github.com/natcap/invest/issues/905 * Workbench * Fixed a bug where some model runs would not generate a new item in the list of recent runs. diff --git a/requirements-docs.yml b/requirements-docs.yml index 471688818a..7eefbd1b64 100644 --- a/requirements-docs.yml +++ b/requirements-docs.yml @@ -12,7 +12,7 @@ channels: dependencies: - chardet>=3.0.4 - Cython -- GDAL>=3.1.2,!=3.3.0,<3.4.1 +- GDAL>=3.4.2 - Flask - flask_cors - numpy>=1.11.0,!=1.16.0 diff --git a/requirements.txt b/requirements.txt index 7c47e826ed..ffbf6d0d6e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ # scripts/convert-requirements-to-conda-yml.py as though it can only be found # on pip. -GDAL>=3.1.2,!=3.3.0,<3.4.1 # https://github.com/OSGeo/gdal/issues/3898 https://github.com/natcap/invest/issues/905 +GDAL>=3.4.2 Pyro4==4.77 # pip-only pandas>=1.2.1 numpy>=1.11.0,!=1.16.0 diff --git a/tests/test_sdr.py b/tests/test_sdr.py index 8c87643932..89f8bac8da 100644 --- a/tests/test_sdr.py +++ b/tests/test_sdr.py @@ -214,10 +214,10 @@ def test_base_regression(self): sdr.execute(args) expected_results = { - 'usle_tot': 14.25030517578, + 'usle_tot': 13.90210914612, 'sed_retent': 308382.125, - 'sed_export': 0.60502111912, - 'sed_dep': 9.05251502991 + 'sed_export': 0.55185163021, + 'sed_dep': 8.80612564087 } vector_path = os.path.join( @@ -286,8 +286,8 @@ def test_regression_with_undefined_nodata(self): sdr.execute(args) expected_results = { 'sed_retent': 308382.125, - 'sed_export': 0.60502111912, - 'usle_tot': 14.25030517578, + 'sed_export': 0.55185163021, + 'usle_tot': 13.90210914612, } vector_path = os.path.join( @@ -335,8 +335,8 @@ def test_drainage_regression(self): expected_results = { 'sed_retent': 476649.875, - 'sed_export': 1.02959537506, - 'usle_tot': 12.97211265564, + 'sed_export': 0.97192692757, + 'usle_tot': 12.68887424469, } vector_path = os.path.join(