Enhance tools #104

sdc50 · 2018-08-27T22:10:26Z

enhance tools api
clean up old tools
add whitebox_tools for watershed tools

* clean up old tools * add whitebox_tools for watershed tools

stickler-ci · 2018-08-27T22:10:39Z

quest/plugins/base/tool_base.py

@@ -3,8 +3,7 @@
 from quest.static import DatasetStatus
 from quest.util import listify, format_json_options

-
-class ToolBase(param.Parameterized):
+class ToolBase(param.ParameterizedFunction):


E302 expected 2 blank lines, found 1

stickler-ci · 2018-08-27T22:10:40Z

quest_io_plugins/raster_gdal.py

        "Open raster and return in requested format"
        raster_data = self.read(path)

-        if fmt == None or fmt.lower() == 'rasterio':
+        if fmt == None or fmt.lower() == 'xarray':


E711 comparison to None should be 'if cond is None:'

stickler-ci · 2018-08-27T22:10:40Z

quest_io_plugins/raster_gdal.py

        "Open raster and return in requested format"
        raster_data = self.read(path)

-        if fmt == None or fmt.lower() == 'rasterio':
+        if fmt == None or fmt.lower() == 'xarray':
+            xarr =  xr.open_rasterio(path, parse_coordinates=True).isel(band=0)


E222 multiple spaces after operator

stickler-ci · 2018-08-27T22:10:40Z

quest_tool_plugins/whitebox/whitebox_watershed.py

+
+    stream_threshold = param.Number(
+        default=1,
+        bounds=(0,1000),  # TODO is there a way to not have an upper bound?


E231 missing whitespace after ','

stickler-ci · 2018-08-27T22:10:41Z

quest_tool_plugins/whitebox/whitebox_watershed.py

+
+
+
+    # algorithm = param.ObjectSelector(default="go-fill",


E303 too many blank lines (3)

stickler-ci · 2018-08-27T22:10:41Z

quest_tool_plugins/whitebox/whitebox_watershed.py

+
+        update_metadata(new_dset, quest_metadata=quest_metadata)
+
+        return {'datasets': new_dset, 'features': [new_features, snapped_outlets]}


W292 no newline at end of file

stickler-ci · 2018-08-27T22:10:41Z

quest/__init__.py

@@ -10,11 +10,13 @@
 import pbr.version
 import warnings
 import logging
+from . import tools


F401 '.tools' imported but unused

stickler-ci · 2018-08-27T22:10:42Z

quest_tool_plugins/whitebox/whitebox_utils.py

+
+    shape = xr_data.shape
+    if len(shape) == 2:
+        shape = (1, *shape)


E999 SyntaxError: invalid syntax

stickler-ci · 2018-08-27T22:10:42Z

quest_tool_plugins/whitebox/whitebox_utils.py

+    docs = {k: v.strip() for k, v in re.findall('^\s*(.*) -- (.*)', tool.__doc__, re.MULTILINE)}
+
+    df = pd.DataFrame([
+                          {'tool': tool.__name__, 'arg_name': k, 'doc': v}


E126 continuation line over-indented for hanging indent

stickler-ci · 2018-08-27T22:10:42Z

quest_tool_plugins/whitebox/whitebox_watershed.py

+
+from quest.plugins import ToolBase
+from quest import util
+from quest.api import get_metadata, new_dataset, update_metadata, new_feature, open_dataset


F401 'quest.api.new_feature' imported but unused

stickler-ci · 2018-08-28T11:40:53Z

quest/tools/__init__.py

+def codify(name):
+    return name.lower().replace('-', '_').replace(' ', '_')
+
+for tool_name, tool in tools.items():


E305 expected 2 blank lines after class or function definition, found 1

coveralls · 2018-08-28T11:57:12Z

Pull Request Test Coverage Report for Build 373

0 of 0 changed or added relevant lines in 0 files are covered.
90 unchanged lines in 8 files lost coverage.
Overall coverage decreased (-0.5%) to 69.043%

Files with Coverage Reduction	New Missed Lines	%
/home/travis/miniconda/envs/test-environment/lib/python3.5/site-packages/quest/plugins/plugins.py	2	95.92%
/home/travis/miniconda/envs/test-environment/lib/python3.6/site-packages/quest/plugins/plugins.py	2	95.92%
/home/travis/miniconda/envs/test-environment/lib/python3.5/site-packages/quest/util/param_util.py	5	68.35%
/home/travis/miniconda/envs/test-environment/lib/python3.6/site-packages/quest/util/param_util.py	5	68.35%
/home/travis/miniconda/envs/test-environment/lib/python3.6/site-packages/quest/api/tools.py	18	20.41%
/home/travis/miniconda/envs/test-environment/lib/python3.5/site-packages/quest/api/tools.py	18	20.41%
/home/travis/miniconda/envs/test-environment/lib/python3.6/site-packages/quest/plugins/base/tool_base.py	20	48.21%
/home/travis/miniconda/envs/test-environment/lib/python3.5/site-packages/quest/plugins/base/tool_base.py	20	48.21%

Totals
Change from base Build 361:	-0.5%
Covered Lines:	3196
Relevant Lines:	4629

💛 - Coveralls

stickler-ci · 2018-08-28T21:11:31Z

quest/util/__init__.py

 from .misc import *
 from .io import read_yaml, write_yaml
 from .config import get_settings, save_settings, update_settings, update_settings_from_file
 from .log import logger, log_to_console, log_to_file
 from . import param_util as param
-from .param_util import format_json_options, NamedString
+from .param_util import format_json_options, Service


F401 '.param_util.Service' imported but unused
F401 '.param_util.format_json_options' imported but unused

stickler-ci · 2018-08-28T21:11:31Z

quest_tool_plugins/whitebox/__init__.py

@@ -0,0 +1,7 @@
+# noqa: F401
+
+from .whitebox_watershed import (


F401 '.whitebox_watershed.WBTFillDepressions' imported but unused
F401 '.whitebox_watershed.WBTExtractStreamsWorkflow' imported but unused
F401 '.whitebox_watershed.WBTWatershedDelineationWorkflow' imported but unused

stickler-ci · 2018-08-31T14:25:42Z

quest/util/__init__.py

 from .misc import *
 from .io import read_yaml, write_yaml
 from .config import get_settings, save_settings, update_settings, update_settings_from_file
 from .log import logger, log_to_console, log_to_file
 from . import param_util as param
-from .param_util import format_json_options, NamedString
+from .param_util import format_json_options, NamedString, Service


F401 '.param_util.Service' imported but unused
F401 '.param_util.format_json_options' imported but unused
F401 '.param_util.NamedString' imported but unused

* enhance tools api

f38afb6

* clean up old tools * add whitebox_tools for watershed tools

stickler-ci reviewed Aug 27, 2018

View reviewed changes

sdc50 added 2 commits August 27, 2018 17:16

stickler

b4f9df2

stickler

1ed0888

stickler-ci reviewed Aug 28, 2018

View reviewed changes

remove python 2 tests

7488ec1

configure appveyor for win64

934e5dc

erdc deleted a comment from stickler-ci Aug 28, 2018

appveyor debug

3711fc3

stickler-ci reviewed Aug 28, 2018

View reviewed changes

appveyor debug

0516ac7

stickler-ci reviewed Aug 31, 2018

View reviewed changes

appveyor debug

8166e62

AaronV77 approved these changes Aug 31, 2018

View reviewed changes

AaronV77 merged commit ea2d856 into erdc:master Aug 31, 2018

This was referenced Aug 31, 2018

Replace terrapin with whitebox_tools #61

Closed

Cleanup Python 2 compatibility code #106

Closed

sdc50 deleted the enhance_tools branch September 19, 2018 18:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enhance tools #104

Enhance tools #104

sdc50 commented Aug 27, 2018

stickler-ci Aug 27, 2018

stickler-ci Aug 27, 2018

stickler-ci Aug 27, 2018

stickler-ci Aug 27, 2018

stickler-ci Aug 27, 2018

stickler-ci Aug 27, 2018

stickler-ci Aug 27, 2018

stickler-ci Aug 27, 2018

stickler-ci Aug 27, 2018

stickler-ci Aug 27, 2018

stickler-ci Aug 28, 2018

coveralls commented Aug 28, 2018 •

edited

Loading

stickler-ci Aug 28, 2018

stickler-ci Aug 28, 2018

stickler-ci Aug 31, 2018


		update_metadata(new_dset, quest_metadata=quest_metadata)

		return {'datasets': new_dset, 'features': [new_features, snapped_outlets]}

		@@ -0,0 +1,7 @@
		# noqa: F401

		from .whitebox_watershed import (

Enhance tools #104

Enhance tools #104

Conversation

sdc50 commented Aug 27, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

coveralls commented Aug 28, 2018 • edited Loading

Pull Request Test Coverage Report for Build 373

💛 - Coveralls

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

coveralls commented Aug 28, 2018 •

edited

Loading