Merge pull request #422 from dcdenu4/release/release-39

Release/release 39
natcap · Dec 12, 2020 · a23dd2b · a23dd2b
2 parents 249107b + 428f981
commit a23dd2b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git 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.
@@ -152,6 +152,7 @@ Unreleased Changes (3.9)
       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.
@@ -160,12 +161,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
@@ -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

diff --git a/requirements.txt b/requirements.txt
@@ -12,15 +12,15 @@
 # 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
 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.2 # pip-only
 psutil>=5.6.6
 chardet>=3.0.4
 xlrd>=1.2.0

diff --git 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(

diff --git 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',