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

Unpin gdal and update sdr test expected values #1036

Merged
merged 4 commits into from
Aug 5, 2022
Merged

Unpin gdal and update sdr test expected values #1036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c38a161
unpin gdal and update sdr test expected values natcap/invest#905
emlys Jul 19, 2022
a6063f5
add history note natcap/invest#905
emlys Jul 20, 2022
da4eb94
bump gdal requirement >=3.4.2
emlys Aug 4, 2022
74bd1b2
bump gdal requirement in RTD environment as well
emlys Aug 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion requirements-docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions tests/test_sdr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down