Merge pull request #12 from materials-data-facility/toolbox-dev

Toolbox dev
materials-data-facility · Mar 5, 2018 · 5dee5f7 · 5dee5f7
2 parents 08929f2 + c3f8112
commit 5dee5f7
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 Untitled*.ipynb
 
 *.cache*
+*pytest_cache*
 
 *temp/*
 

diff --git a/mdf_toolbox/__init__.py b/mdf_toolbox/__init__.py
@@ -0,0 +1 @@
+from .toolbox import *
diff --git a/mdf_toolbox/toolbox.py b/mdf_toolbox/toolbox.py
@@ -529,7 +529,7 @@ def format_gmeta(data):
     Arguments:
     data (dict or list): The data to be formatted.
         If data is a dict, it must contain:
-        data["mdf"]["landing_page"] (str): A URI to a web page for the entry.
+        data["mdf"]["mdf_id"] (str): A unique identifier.
         data["mdf"]["acl"] (list of str): A list of Globus UUIDs that are allowed to view the entry.
         If data is a list, it must consist of GMetaEntry documents.
 
@@ -541,7 +541,9 @@ def format_gmeta(data):
         return {
             "@datatype": "GMetaEntry",
             "@version": "2016-11-09",
-            "subject": data["mdf"]["landing_page"],
+            "subject": ("https://materialsdatafacility.org/data/{}/{}"
+                        .format(data["mdf"].get("parent_id", data["mdf"]["mdf_id"]),
+                                data["mdf"]["mdf_id"])),
             "visible_to": data["mdf"].pop("acl"),
             "content": data
             }

diff --git a/setup.cfg b/setup.cfg
@@ -6,5 +6,5 @@ universal=1
 addopts = --ignore=setup.py --cov=mdf_toolbox
 
 [flake8]
-exclude = .git,*.egg*
+exclude = .git,*.egg*,*__init__.py
 max-line-length = 100
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='mdf_toolbox',
-    version='0.1.5',
+    version='0.1.6',
     packages=['mdf_toolbox'],
     description='Materials Data Facility Python utilities',
     long_description=("Toolbox is the Materials Data Facility Python package"

diff --git a/tests/test_toolbox.py b/tests/test_toolbox.py
@@ -148,7 +148,7 @@ def test_format_gmeta():
     md1 = {
         "mdf": {
             "acl": ["public"],
-            "landing_page": "https://example.com"
+            "mdf_id": "123"
             }
         }
     # More complex GMetaEntry
@@ -158,7 +158,6 @@ def test_format_gmeta():
                 "acl": ["public"],
                 "source_name": "source name",
                 "citation": ["abc"],
-                "landing_page": "http://www.globus.org",
                 "data_contact": {
                     "given_name": "Test",
                     "family_name": "McTesterson",
@@ -173,7 +172,8 @@ def test_format_gmeta():
                 }],
                 "ingest_date": "Jan 1, 2017",
                 "metadata_version": "1.1",
-                "mdf_id": "1",
+                "mdf_id": "123",
+                "parent_id": "000",
                 "resource_type": "dataset"
         },
         "dc": {},
@@ -185,26 +185,25 @@ def test_format_gmeta():
     assert gme1 == {
             "@datatype": "GMetaEntry",
             "@version": "2016-11-09",
-            "subject": "https://example.com",
+            "subject": "https://materialsdatafacility.org/data/123/123",
             "visible_to": ["public"],
             "content": {
                 "mdf": {
-                    "landing_page": "https://example.com"
+                    "mdf_id": "123"
                 }
             }
         }
     gme2 = toolbox.format_gmeta(md2)
     assert gme2 == {
             "@datatype": "GMetaEntry",
             "@version": "2016-11-09",
-            "subject": "http://www.globus.org",
+            "subject": "https://materialsdatafacility.org/data/000/123",
             "visible_to": ["public"],
             "content": {
                 "mdf": {
                     "title": "test",
                     "source_name": "source name",
                     "citation": ["abc"],
-                    "landing_page": "http://www.globus.org",
                     "data_contact": {
                         "given_name": "Test",
                         "family_name": "McTesterson",
@@ -219,7 +218,8 @@ def test_format_gmeta():
                     }],
                     "ingest_date": "Jan 1, 2017",
                     "metadata_version": "1.1",
-                    "mdf_id": "1",
+                    "mdf_id": "123",
+                    "parent_id": "000",
                     "resource_type": "dataset"
                 },
                 "dc": {},