From c07a13ac09074274cd42e476e98156c108ad32ac Mon Sep 17 00:00:00 2001 From: Doug Date: Fri, 11 Dec 2020 08:32:08 -0500 Subject: [PATCH 1/6] I. #402 Updating History Makefile for release --- HISTORY.rst | 10 ++-------- Makefile | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index dd8a691663..98fa8f7d4f 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -32,8 +32,8 @@ .. :changelog: -Unreleased Changes (3.9) ------------------------- +3.9.0 (2020-12-11) +------------------ * General: * Deprecating GDAL 2 and adding support for GDAL 3. * Adding function in utils.py to handle InVEST coordindate transformations. @@ -160,12 +160,6 @@ Unreleased Changes (3.9) and ``serv_blt`` respectively to fix an issue where ArcGIS would not display properly. -.. -.. -.. - Unreleased Changes - ------------------ - 3.8.9 (2020-09-15) ------------------ * Hydropower diff --git a/Makefile b/Makefile index 1835e785c5..fe439ad38f 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ GIT_SAMPLE_DATA_REPO_REV := b7a51f189315e08484b5ba997a5c1de88ab7f06d GIT_TEST_DATA_REPO := https://bitbucket.org/natcap/invest-test-data.git GIT_TEST_DATA_REPO_PATH := $(DATA_DIR)/invest-test-data -GIT_TEST_DATA_REPO_REV := 718d2035c59f1917d836208a0769dab101ac4bcc +GIT_TEST_DATA_REPO_REV := 6fd5fa39cd9d81080caa7581f9acca7b9fadb7c8 GIT_UG_REPO := https://github.com/natcap/invest.users-guide GIT_UG_REPO_PATH := doc/users-guide From 200079b06f4e52a970e644c0e85b8215cffee286 Mon Sep 17 00:00:00 2001 From: Doug Date: Fri, 11 Dec 2020 10:23:25 -0500 Subject: [PATCH 2/6] I. #402 fix FCEE UG link and remove GDAL pin Removing GDAL pin because I noticed that even with 3.1.2 I was getting the virtualXpath outputs in the consol. --- requirements.txt | 2 +- src/natcap/invest/ui/forest_carbon.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3628e8eeb4..c9c15c4afd 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 +GDAL>=3.1.2 Pyro4==4.77 # pip-only pandas>=1.0 numpy>=1.11.0,!=1.16.0 diff --git a/src/natcap/invest/ui/forest_carbon.py b/src/natcap/invest/ui/forest_carbon.py index 48b351dea6..cd8153f569 100644 --- a/src/natcap/invest/ui/forest_carbon.py +++ b/src/natcap/invest/ui/forest_carbon.py @@ -11,7 +11,7 @@ def __init__(self): label='Forest Carbon Edge Effect Model', target=natcap.invest.forest_carbon_edge_effect.execute, validator=natcap.invest.forest_carbon_edge_effect.validate, - localdoc=natcap.invest.forest_carbon_edge_effect.ARGS_SPEC.userguide_html) + localdoc=natcap.invest.forest_carbon_edge_effect.ARGS_SPEC['userguide_html']) self.lulc_raster_path = inputs.File( args_key='lulc_raster_path', From b32524c3a25a86157e1b70c83df01cd9f94f5984 Mon Sep 17 00:00:00 2001 From: Doug Date: Fri, 11 Dec 2020 15:14:03 -0500 Subject: [PATCH 3/6] I. #402 updating TG to 0.10.1 Also setting as # pip-only because I'm not sure how quickly it'll make it to conda-forge! --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c9c15c4afd..a43fc0a03c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,7 @@ Rtree>=0.8.2,!=0.9.1 Shapely>=1.7.1,<2.0.0 scipy>=0.16.1,<1.5.0 # pip-only pygeoprocessing>=2.1.1 # pip-only -taskgraph[niced_processes]>=0.10.0 +taskgraph[niced_processes]>=0.10.1 # pip-only psutil>=5.6.6 chardet>=3.0.4 xlrd>=1.2.0 From 228106b8ebc7453de391d94c84d1c966087cc231 Mon Sep 17 00:00:00 2001 From: Doug Date: Fri, 11 Dec 2020 16:39:15 -0500 Subject: [PATCH 4/6] I. #402 bumping TG to 0.10.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a43fc0a03c..c87cec26db 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,7 @@ Rtree>=0.8.2,!=0.9.1 Shapely>=1.7.1,<2.0.0 scipy>=0.16.1,<1.5.0 # pip-only pygeoprocessing>=2.1.1 # pip-only -taskgraph[niced_processes]>=0.10.1 # pip-only +taskgraph[niced_processes]>=0.10.2 # pip-only psutil>=5.6.6 chardet>=3.0.4 xlrd>=1.2.0 From 548dcd28ff7086fd8f6484d9e9c52ee38e16876c Mon Sep 17 00:00:00 2001 From: Doug Date: Fri, 11 Dec 2020 17:39:05 -0500 Subject: [PATCH 5/6] Adding a missing dep task in sdr --- src/natcap/invest/sdr/sdr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/natcap/invest/sdr/sdr.py b/src/natcap/invest/sdr/sdr.py index 983b0a4d62..8662e5b78a 100644 --- a/src/natcap/invest/sdr/sdr.py +++ b/src/natcap/invest/sdr/sdr.py @@ -487,7 +487,7 @@ def execute(args): copy_duplicate_artifact=True, target_path_list=[f_reg['rkls_path']], dependent_task_list=[ - align_task, drainage_raster_path_task[1]], + align_task, drainage_raster_path_task[1], ls_factor_task], task_name='calculate RKLS') usle_task = task_graph.add_task( From 428f981dd3c427a2d0b68e85936069195e8062ce Mon Sep 17 00:00:00 2001 From: Doug Date: Fri, 11 Dec 2020 17:42:12 -0500 Subject: [PATCH 6/6] update history for sdr dep fix --- HISTORY.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/HISTORY.rst b/HISTORY.rst index 98fa8f7d4f..52d4323799 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -152,6 +152,7 @@ to "333" leading to high export spikes in some pixels. * Fixed an issue where sediment deposition progress logging was not progressing linearly. + * Fixed a task dependency bug that in rare cases could cause failure. * Urban Cooling * Split energy savings valuation and work productivity valuation into separate UI options.