API cleanup #63

AaronV77 · 2018-05-16T18:36:38Z

Removed miscellaneous code from util and added comments to the util misc.py file.

AaronV77 · 2018-05-16T18:37:03Z

Fixes #55

stickler-ci · 2018-05-16T18:37:17Z

quest/util/misc.py

@@ -19,32 +19,67 @@
 from uuid import uuid4, UUID
 import quest

-the_providers = None
+from geojson import LineString, Point, Polygon, Feature, FeatureCollection, MultiPolygon


F811 redefinition of unused 'LineString' from line 1
F811 redefinition of unused 'Point' from line 1
F811 redefinition of unused 'Polygon' from line 1
F811 redefinition of unused 'Feature' from line 1
F811 redefinition of unused 'FeatureCollection' from line 1
F811 redefinition of unused 'MultiPolygon' from line 1

stickler-ci · 2018-05-16T18:37:17Z

quest/util/misc.py

@@ -19,32 +19,67 @@
 from uuid import uuid4, UUID
 import quest

-the_providers = None
+from geojson import LineString, Point, Polygon, Feature, FeatureCollection, MultiPolygon
+from jinja2 import Environment, FileSystemLoader


F811 redefinition of unused 'Environment' from line 3
F811 redefinition of unused 'FileSystemLoader' from line 3

stickler-ci · 2018-05-16T18:37:17Z

quest/util/misc.py

-the_providers = None
+from geojson import LineString, Point, Polygon, Feature, FeatureCollection, MultiPolygon
+from jinja2 import Environment, FileSystemLoader
+from past.builtins import basestring  # for python 2 compatibility


F811 redefinition of unused 'basestring' from line 13

stickler-ci · 2018-05-16T18:37:17Z

quest/util/misc.py

+from geojson import LineString, Point, Polygon, Feature, FeatureCollection, MultiPolygon
+from jinja2 import Environment, FileSystemLoader
+from past.builtins import basestring  # for python 2 compatibility
+from .config import get_settings


F811 redefinition of unused 'get_settings' from line 4

stickler-ci · 2018-05-16T18:37:18Z

quest/util/misc.py

+from jinja2 import Environment, FileSystemLoader
+from past.builtins import basestring  # for python 2 compatibility
+from .config import get_settings
+from .. import get_pkg_data_path


F811 redefinition of unused 'get_pkg_data_path' from line 5

stickler-ci · 2018-05-16T18:37:19Z

quest/util/misc.py

+import pandas as pd
+import importlib
+import inspect
+import pkgutil


F401 'pkgutil' imported but unused

stickler-ci · 2018-05-16T18:37:19Z

quest/util/misc.py

+import importlib
+import inspect
+import pkgutil
+import quest


F811 redefinition of unused 'quest' from line 20
F401 'quest' imported but unused

stickler-ci · 2018-05-16T18:37:19Z

quest/util/misc.py

+import inspect
+import pkgutil
+import quest
+import os


F811 redefinition of unused 'os' from line 6

stickler-ci · 2018-05-16T18:37:19Z

quest/util/misc.py

+import pkgutil
+import quest
+import os
+import re


F811 redefinition of unused 're' from line 9

stickler-ci · 2018-05-16T18:37:19Z

quest/util/misc.py

+import re
+
+try:
+    import simplejson as json


F811 redefinition of unused 'json' from line 17

stickler-ci · 2018-05-17T14:53:34Z

quest/api/manage.py

@@ -42,7 +42,7 @@ def delete(uris):
        return True

    # group uris by type
-    grouped_uris = util.classify_uris(uris, as_dataframe=False, exclude=['providers'], require_same_type=True)
+    grouped_uris = util.classify_uris(uris, as_dataframe=False, exclude=['services', 'publishers'], require_same_type=True)


E501 line too long (123 > 120 characters)

stickler-ci · 2018-05-17T14:53:34Z

quest/api/manage.py

@@ -88,7 +88,7 @@ def move(uris, destination_collection, as_dataframe=None, expand=None):
    if not uris:                                                                                                                        
        return {}                                                                                                                       

-    grouped_uris = util.classify_uris(uris, as_dataframe=False, exclude=['providers', 'collections'], require_same_type=True)
+    grouped_uris = util.classify_uris(uris, as_dataframe=False, exclude=['services', 'publishers', 'collections'], require_same_type=True)


E501 line too long (138 > 120 characters)

stickler-ci · 2018-05-17T14:53:34Z

quest/api/manage.py

@@ -137,7 +137,7 @@ def copy(uris, destination_collection, as_dataframe=None, expand=None):
    if not uris:                                                                                                                        
        return {}                                                                                                                       

-    grouped_uris = util.classify_uris(uris, as_dataframe=False, exclude=['providers', 'collections'], require_same_type=True)
+    grouped_uris = util.classify_uris(uris, as_dataframe=False, exclude=['services', 'publishers', 'collections'], require_same_type=True)


E501 line too long (138 > 120 characters)

stickler-ci · 2018-05-17T14:53:34Z

quest/api/metadata.py

@@ -122,7 +119,7 @@ def update_metadata(uris, display_name=None, description=None,
            metadata at each uri keyed on uris
    """
    # group uris by type
-    grouped_uris = util.classify_uris(uris, as_dataframe=False, exclude=['providers'], require_same_type=True)
+    grouped_uris = util.classify_uris(uris, as_dataframe=False, exclude=['services', 'publishers'], require_same_type=True)


E501 line too long (123 > 120 characters)

stickler-ci · 2018-05-17T14:58:17Z

quest/api/manage.py

@@ -137,7 +137,7 @@ def copy(uris, destination_collection, as_dataframe=None, expand=None):
    if not uris:                                                                                                                        
        return {}                                                                                                                       

-    grouped_uris = util.classify_uris(uris, as_dataframe=False, exclude=['providers', 'collections'], require_same_type=True)
+    grouped_uris = util.classify_uris(uris, as_dataframe=False, exclude=['services', 'publishers', 'collections'], require_same_type=True)


E501 line too long (138 > 120 characters)

stickler-ci · 2018-05-23T15:19:37Z

quest/api/manage.py

@@ -137,7 +137,7 @@ def copy(uris, destination_collection, as_dataframe=None, expand=None):
    if not uris:                                                                                                                        
        return {}                                                                                                                       

-    grouped_uris = util.classify_uris(uris, as_dataframe=False, exclude=['providers', 'collections'], require_same_type=True)
+    grouped_uris = util.classify_uris(uris, as_dataframe=False, exclude=['services', 'publishers', 'collections'], require_same_type=True)


E501 line too long (138 > 120 characters)

coveralls · 2018-05-23T15:38:07Z

Pull Request Test Coverage Report for Build 187

0 of 0 changed or added relevant lines in 0 files are covered.
61 unchanged lines in 3 files lost coverage.
Overall coverage increased (+1.7%) to 68.892%

Files with Coverage Reduction	New Missed Lines	%
/Users/travis/miniconda/envs/test-environment/lib/python3.6/site-packages/quest/api/metadata.py	12	84.31%
/Users/travis/miniconda/envs/test-environment/lib/python3.6/site-packages/quest/api/manage.py	15	88.24%
/Users/travis/miniconda/envs/test-environment/lib/python3.6/site-packages/quest/util/misc.py	34	78.26%

Totals
Change from base Build 181:	1.7%
Covered Lines:	1455
Relevant Lines:	2112

💛 - Coveralls

sdc50 · 2018-05-24T18:10:35Z

quest/util/misc.py


    Args:
-        update (bool):
-            whether to update cached files.
+        param1 (string): A string that is a filename.


The doc strings should use the actual argument name (i.e. path and mkdir) not param1 and param2

…isc.py file.

…e to pair up with the svc:: uri.

AaronV77 · 2018-05-24T18:35:39Z

@sdc50 There are one or two methods that don't have anything really filled out in them, can you tell me what to put for some of these? Thanks.

sdc50 · 2018-05-24T18:53:27Z

@AaronV77 can you tell me what the method names are?

AaronV77 · 2018-05-24T18:55:34Z

@sdc50 they are: classify_uris, and build_smtk.

sdc50 · 2018-05-24T19:15:47Z

quest/util/misc.py


-    classified by resource type
+    Args:
+        uris (?):


uris (list or string): List of Quest uris to classify into the following types: 'collections', 'services', 'publishers', 'datasets', or 'features'.

grouped (bool): If True returns Pandas GroupBy object (see: https://pandas.pydata.org/pandas-docs/stable/groupby.html)

as_dataframe (bool): If True returns a Pandas DataFrame

require_same_type (bool): If True raises a `ValueError` if uris of more than one type are passed in.

exclude (list or string): List of uri types to not allow. If a uri of an excluded type is passed in then a `ValueError` will be raised.

sdc50 · 2018-05-24T19:20:05Z

quest/util/misc.py

+    """Build smtk file from the template, kwargs, and stream as a string.
+
+    Args:
+        smtk_subdir (string):


smtk_subdir (string): subdirectory where SMTK template is stored.
smtk_filename (string): name of the SMTK template file.
kwargs (kwargs): Keyword arguments to render the SMTK template with.

stickler-ci · 2018-05-24T19:32:00Z

quest/util/misc.py


-    classified by resource type
+    Args:
+        uris (list or string): List of Quest uris to classify into the following types: 'collections', 'services', 'publishers', 'datasets', or 'features'.


E501 line too long (155 > 120 characters)

stickler-ci · 2018-05-24T19:32:00Z

quest/util/misc.py

-    classified by resource type
+    Args:
+        uris (list or string): List of Quest uris to classify into the following types: 'collections', 'services', 'publishers', 'datasets', or 'features'.
+        grouped (bool): If True returns Pandas GroupBy object (see: https://pandas.pydata.org/pandas-docs/stable/groupby.html)


E501 line too long (126 > 120 characters)

stickler-ci · 2018-05-24T19:32:00Z

quest/util/misc.py

+        grouped (bool): If True returns Pandas GroupBy object (see: https://pandas.pydata.org/pandas-docs/stable/groupby.html)
+        as_dataframe (bool): If True returns a Pandas DataFrame
+        require_same_type (bool): If True raises a `ValueError` if uris of more than one type are passed in.
+        exclude (list or string): List of uri types to not allow. If a uri of an excluded type is passed in then a `ValueError` will be raised.


E501 line too long (143 > 120 characters)

stickler-ci · 2018-05-24T19:32:00Z

quest_io_plugins/timeseries-hdf5.py

@@ -21,7 +21,7 @@ def open(self, path, fmt=None):
            return dataframe

        # convert index to datetime in case it is a PeriodIndex
-        dataframe.index = dataframe.index.to_datetime()
+        dataframe.index = dataframe.index.()


E999 SyntaxError: invalid syntax

stickler-ci reviewed May 16, 2018

View reviewed changes

AaronV77 self-assigned this May 16, 2018

AaronV77 added enhancement New feature or request refactor labels May 16, 2018

AaronV77 added this to the Quest 2.6 Release milestone May 16, 2018

stickler-ci reviewed May 17, 2018

View reviewed changes

AaronV77 mentioned this pull request May 17, 2018

Updated the metadata and misc for allowing publishers. #54

Closed

stickler-ci reviewed May 23, 2018

View reviewed changes

sdc50 reviewed May 24, 2018

View reviewed changes

AaronV77 added 7 commits May 24, 2018 13:32

Removed miscellaneous code from util and added comments to the util m…

bf72b07

…isc.py file.

Got rid of the double imports mistake.

66661b2

Re-Changed providers to services to better match the rest of the code…

ecfb337

…e to pair up with the svc:: uri.

Added publishers to metadata.py.

1fd22fe

Stickler issues fixed.

e5e53d5

Fixed Stickler issues.

8696507

Fixed a grammar error.

c684692

AaronV77 closed this May 24, 2018

AaronV77 reopened this May 24, 2018

sdc50 reviewed May 24, 2018

View reviewed changes

Updated method comments.

c85e867

stickler-ci reviewed May 24, 2018

View reviewed changes

sdc50 approved these changes May 24, 2018

View reviewed changes

AaronV77 added 3 commits May 24, 2018 14:38

Corrected mistakes.

1c787e1

Fixed stickler issues.

031a2c0

Got rid of to_pydatetime

005faa9

sdc50 approved these changes May 24, 2018

View reviewed changes

sdc50 merged commit a7f15e1 into erdc:master May 24, 2018

sdc50 mentioned this pull request May 24, 2018

Remove unused functions in utils #55

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

API cleanup #63

API cleanup #63

AaronV77 commented May 16, 2018

AaronV77 commented May 16, 2018

stickler-ci May 16, 2018

stickler-ci May 16, 2018

stickler-ci May 16, 2018

stickler-ci May 16, 2018

stickler-ci May 16, 2018

stickler-ci May 16, 2018

stickler-ci May 16, 2018

stickler-ci May 16, 2018

stickler-ci May 16, 2018

stickler-ci May 16, 2018

stickler-ci May 17, 2018

stickler-ci May 17, 2018

stickler-ci May 17, 2018

stickler-ci May 17, 2018

stickler-ci May 17, 2018

stickler-ci May 23, 2018

coveralls commented May 23, 2018 •

edited

Loading

sdc50 May 24, 2018

AaronV77 commented May 24, 2018

sdc50 commented May 24, 2018

AaronV77 commented May 24, 2018

sdc50 May 24, 2018

sdc50 May 24, 2018

stickler-ci May 24, 2018

stickler-ci May 24, 2018

stickler-ci May 24, 2018

stickler-ci May 24, 2018

API cleanup #63

API cleanup #63

Conversation

AaronV77 commented May 16, 2018

AaronV77 commented May 16, 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

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 May 23, 2018 • edited Loading

Pull Request Test Coverage Report for Build 187

💛 - Coveralls

Choose a reason for hiding this comment

AaronV77 commented May 24, 2018

sdc50 commented May 24, 2018

AaronV77 commented May 24, 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

coveralls commented May 23, 2018 •

edited

Loading