Merge pull request #46 from materials-data-facility/forge-dev

Forge dev

Author: jgaff

.travis.yml

@@ -2,6 +2,7 @@ language: python
 python:
 - '3.5'
 - '3.6'
+- '3.7'
 install:
 - pip install --upgrade pip
 - pip install -e .

mdf_forge/forge.py

@@ -1,4 +1,3 @@
-import json
 import os
 import re
 from urllib.parse import urlparse
@@ -955,7 +954,7 @@ def describe_field(self, resource_type, field=None, raw=False):
             if error is not None:
                 print(error)
             else:
-                mdf_toolbox.print_jsonschema(schema)
+                [print(line) for line in mdf_toolbox.prettify_jsonschema(schema)]
         return
 
     def describe_organization(self, organization, summary=False, raw=False):
@@ -1036,16 +1035,5 @@ def describe_organization(self, organization, summary=False, raw=False):
                         if not org.get("parent_organizations"):
                             org.pop("parent_organizations", None)
 
-                    # Print dict as key: value
-                    # All values besides "services" are max single-depth containers
-                    for k, v in org.items():
-                        if not v:
-                            v = "None"
-                        # "services", just prettyprint the dict
-                        if isinstance(v, dict):
-                            print("\t{}: {}".format(k, json.dumps(v, indent=4)))
-                        elif isinstance(v, list):
-                            print("\t{}: {}".format(k, ", ".join([(x or "None") for x in v])))
-                        else:
-                            print("\t{}: {}".format(k, str(v)))
+                    [print(line) for line in mdf_toolbox.prettify_json(org)]
         return

setup.py

@@ -2,15 +2,15 @@
 
 setup(
     name='mdf_forge',
-    version='0.7.3',
+    version='0.7.4',
     packages=['mdf_forge'],
     description='Materials Data Facility python package',
     long_description=("Forge is the Materials Data Facility Python package"
                       " to interface and leverage the MDF Data Discovery service. "
                       "Forge allows users to perform simple queries and "
                       "facilitiates moving and synthesizing results."),
     install_requires=[
-        "mdf-toolbox>=0.4.7",
+        "mdf-toolbox>=0.4.10",
         "globus-sdk>=1.7.0",
         "requests>=2.18.4",
         "tqdm>=4.19.4"

tests/test_forge.py

@@ -668,8 +668,8 @@ def test_describe_organization(capsys):
     f.describe_organization("CHiMaD")
     out, err = capsys.readouterr()
     assert "canonical_name: Center for Hierarchical Materials Design" in out
-    assert "aliases: CHiMaD" in out
-    assert "permission_groups: public" in out
+    assert "CHiMaD" in out
+    assert "public" in out
     # List
     f.describe_organization("list")
     out, err = capsys.readouterr()
@@ -682,8 +682,8 @@ def test_describe_organization(capsys):
     out, err = capsys.readouterr()
     assert "canonical_name: Center for Hierarchical Materials Design" not in out
     assert "Center for Hierarchical Materials Design" in out
-    assert "aliases: CHiMaD" in out
-    assert "permission_groups: public" not in out
+    assert "CHiMaD" in out
+    assert "public" not in out
 
     # Errors
     # Invalid org