Merge branch 'pfhub-upload-template' into bug-report-template

.travis.yml

@@ -46,7 +46,6 @@ script:
     ";
   - nix-shell _apps/data/shell.nix --pure --command "
       cd _apps/data &&
-      #py.test test.py &&
       black --check *.py &&
       pylint *.py &&
       flake8 *.py

_data/python-pfhub/pfhub/conftest.py

@@ -5,7 +5,7 @@
 import yaml
 
 
-def make_yaml_content(id_, version):
+def make_yaml_content(id_, version, name=None):
     """Generate some test yaml content
 
     Args:
@@ -15,7 +15,7 @@ def make_yaml_content(id_, version):
     Returns:
       yaml result content as string
     """
-    return f"""
+    data = f"""
 ---
 benchmark:
   id: {id_}
@@ -45,24 +45,30 @@ def make_yaml_content(id_, version):
         expr: datum.y * 2
         as: b
 """
+    if name is not None:
+        data = data + f"\nname: {name}"
+    return data
 
 
-def make_yaml(dir_, name, id_, version):
+def make_yaml(dir_, name, id_, version, add_name=False):
     """Generate a yaml file for test purposes
 
     Args:
       dir_: the result directory to write to
       name: name of the result
       id_: the benchmark id_ (e.g. "8a")
       version: the version (e.g. "1")
+      name: the name of the simulation (e.g. "fipy1a")
 
     Returns:
       name of the file created
     """
     dir_name = dir_ / name
     dir_name.mkdir(exist_ok=True)
     yaml_file = dir_name / "meta.yaml"
-    yaml_file.write_text(make_yaml_content(id_, version))
+    yaml_file.write_text(
+        make_yaml_content(id_, version, name=name if add_name else None)
+    )
     return yaml_file
 
 
@@ -80,6 +86,20 @@ def yaml_data_file(tmp_path):
     return make_yaml(tmp_path, "result", "1a", 1)
 
 
+@pytest.fixture
+def yaml_data_file_with_name(tmp_path):
+    """Generate a yaml test file with name included
+
+    Args:
+      tmp_path: temporary area to use to write files
+
+    Returns:
+      name of the data file
+    """
+    tmp_path.mkdir(exist_ok=True)
+    return make_yaml(tmp_path, "result1", "1a", 1, add_name=True)
+
+
 @pytest.fixture
 def test_data_path(tmp_path):
     """Generate two result data files

_data/python-pfhub/pfhub/main.py

@@ -103,16 +103,20 @@ def read_add_name(yaml_url):
 
     >>> assert read_add_name(getfixture('yaml_data_file').as_uri())['name'] == 'result'
 
+    >>> assert read_add_name(
+    ...     getfixture('yaml_data_file_with_name'
+    ... ).as_uri())['name'] == 'result1'
+
     """
     data = read_yaml_from_url(yaml_url)
-    if 'name' in data:
+    if "name" in data:
         return data
-    else:
-        return assoc(
-            read_yaml_from_url(yaml_url),
-            "name",
-            os.path.split(os.path.split(yaml_url)[0])[1],
-        )
+
+    return assoc(
+        read_yaml_from_url(yaml_url),
+        "name",
+        os.path.split(os.path.split(yaml_url)[0])[1],
+    )
 
 
 def maybe(func):
@@ -210,9 +214,7 @@ def concat_items(items):
 
     """
     concat = lambda x: pandas.concat(x) if x != [] else None
-    return pipe(
-        items, map_(lambda x: assign(x[0], x[1])), compact, list, concat
-    )
+    return pipe(items, map_(lambda x: assign(x[0], x[1])), compact, list, concat)
 
 
 @curry
@@ -573,12 +575,11 @@ def read_vega_data(keys, data):
 
     read_values = sequence(get("values"), pandas.DataFrame)
 
-
     return pipe(
         data,
         read_url if "url" in data else read_values,
         apply_transforms(data),
-        maybe(lambda x: get(keys, x))
+        maybe(lambda x: get(keys, x)),
     )