fix timestamp and module list issue

Author: d-chambers

obspy_github_api/obspy_github_api.py

@@ -11,7 +11,6 @@
 
 import github3
 
-
 # regex pattern in comments for requesting a docs build
 PATTERN_DOCS_BUILD = r"\+DOCS"
 # regex pattern in comments for requesting tests of specific submodules
@@ -30,7 +29,7 @@ def get_github_client(token=None):
     if token is None:
         msg = (
             "Could not get authorization token for ObsPy github API "
-            "(env variable OBSPY_COMMIT_STATUS_TOKEN)"
+            "(env variable GITHUB_TOKEN)"
         )
         warnings.warn(msg)
         gh = github3.GitHub()
@@ -223,9 +222,9 @@ def get_commit_time(commit, fork="obspy", token=None):
     repo = gh.repository(fork, "obspy")
     commit = repo.commit(commit)
     dt = datetime.datetime.strptime(
-        commit.commit.committer["date"], "%Y-%m-%dT%H:%M:%SZ"
+        commit.commit["committer"]["date"], "%Y-%m-%dT%H:%M:%SZ"
     )
-    return time.mktime(dt.timetuple())
+    return dt.timestamp()
 
 
 def get_issue_numbers_that_request_docs_build(verbose=False, token=None):
@@ -460,17 +459,20 @@ def make_ci_json_config(issue_number, path="obspy_ci_conf.json", token=None):
     # comment string to use for later actions.
     module_list = get_module_test_list(issue_number, token=token)
     docs = check_docs_build_requested(issue_number, token=token)
+    module_list_obspy_prepended = [f"obspy.{x}" for x in module_list]
 
     out = dict(
-        module_list=("obspy." + ",obspy.").join(module_list),
+        module_list=",".join(module_list_obspy_prepended),
         module_list_spaces=" ".join(module_list),
         docs=docs,
     )
 
-    # make sure path exists
-    path = Path(path)
-    path_dir = path if path.is_dir() else path.parent
-    path_dir.mkdir(exist_ok=True, parents=True)
+    # Write output to file if path is not None
+    if path is not None:
+        path = Path(path)
+        path_dir = path if path.is_dir() else path.parent
+        path_dir.mkdir(exist_ok=True, parents=True)
+        with path.open("w") as fi:
+            json.dump(out, fi, indent=4)
 
-    with path.open("w") as fi:
-        json.dump(out, fi, indent=4)
+    return out

obspy_github_api/tests/test_cli.py

@@ -1,9 +1,7 @@
 """
 Tests for command line interface.
 """
-import contextlib
 import json
-import unittest
 import tempfile
 from pathlib import Path
 from subprocess import run

obspy_github_api/tests/test_obspy_github_api.py

@@ -8,6 +8,7 @@
     get_commit_time,
     get_issue_numbers_that_request_docs_build,
     get_module_test_list,
+    make_ci_json_config,
 )
 
 
@@ -62,11 +63,20 @@ def test_get_commit_status():
 
 def test_get_commit_time():
     sha = "f74e0f5bcf26a47df6138c1ce026d9d14d68c4d7"
-    assert get_commit_time(sha) == 1471873965.0
+    assert get_commit_time(sha) == 1471906365.0
 
 
 def test_get_issue_numbers_that_request_docs_build():
     issues = get_issue_numbers_that_request_docs_build()
     assert isinstance(issues, list)
     for issue in issues:
         assert isinstance(issue, int)
+
+
+def test_json_ci_config():
+    """Tests contents of configuration dict."""
+    config_dict = make_ci_json_config(100, path=None)
+    assert isinstance(config_dict, dict)
+    # ensure module list elements don't end in '.'
+    module_list_split = config_dict["module_list"].split(",")
+    assert all([not x.endswith(".") for x in module_list_split])