Merge branch 'main' into cache

CCBR · Dec 2, 2024 · 3d6f38f · 3d6f38f
2 parents ecc8780 + 727a622
commit 3d6f38f
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,12 @@
 ## Tools development version
 
+## Tools 0.1.2
+
 - use major & minor version for docs website subdirectories. (#15, @kelly-sovacool)
-- Fig bug where `nextflow.run()` did not import the correct HPC modules. (#20, @kelly-sovacool)
-- Fix shared SIF cache directory spelling for biowulf. (#23, @kelly-sovacool)
+- fig bug where `nextflow.run()` did not import the correct HPC modules. (#20, @kelly-sovacool)
+- fix bug in `_get_file_mtime()`. (#21, @kelly-sovacool)
+- fix shared SIF cache directory spelling for biowulf. (#23, @kelly-sovacool)
+
 
 ## Tools 0.1.1
 

diff --git a/src/ccbr_tools/CITATION.cff b/src/ccbr_tools/CITATION.cff
@@ -1,14 +1,18 @@
 cff-version: 1.2.0
-message: "Please cite CCBR Tools as below"
+message: Please cite CCBR Tools as below
 authors:
   - family-names: Sovacool
     given-names: Kelly
     orcid: https://orcid.org/0000-0003-3283-829X
-    affiliation: Advanced Biomedical Computational Science, Frederick National Laboratory for Cancer Research, Frederick, MD 21702, USA
+    affiliation:
+      Advanced Biomedical Computational Science, Frederick National Laboratory
+      for Cancer Research, Frederick, MD 21702, USA
   - family-names: Koparde
     given-names: Vishal
     orcid: https://orcid.org/0000-0001-8978-8495
-    affiliation: Advanced Biomedical Computational Science, Frederick National Laboratory for Cancer Research, Frederick, MD 21702, USA
+    affiliation:
+      Advanced Biomedical Computational Science, Frederick National Laboratory
+      for Cancer Research, Frederick, MD 21702, USA
   - family-names: Kuhn
     given-names: Skyler
   - family-names: Tandon
@@ -21,8 +25,8 @@ repository-code: https://github.com/CCBR/Tools
 license: MIT
 type: software
 identifiers:
-  - description: "Archived snapshots of all versions"
+  - description: Archived snapshots of all versions
     type: doi
-    value: "10.5281/zenodo.13377166"
-version: v0.1.0
-date-released: "2024-08-26"
+    value: 10.5281/zenodo.13377166
+version: v0.1.2
+date-released: "2024-11-26"
diff --git a/src/ccbr_tools/VERSION b/src/ccbr_tools/VERSION
@@ -1 +1 @@
-0.1.1-dev
+0.1.2-dev
diff --git a/src/ccbr_tools/pipeline/util.py b/src/ccbr_tools/pipeline/util.py
@@ -353,7 +353,7 @@ def check_python_version(MIN_PYTHON=(3, 11)):
 
 
 def _get_file_mtime(f):
-    timestamp = datetime.fromtimestamp(os.path.getmtime(os.path.abspath(f)))
+    timestamp = datetime.datetime.fromtimestamp(os.path.getmtime(os.path.abspath(f)))
     mtime = timestamp.strftime("%y%m%d%H%M%S")
     return mtime
 

diff --git a/tests/data/file.txt b/tests/data/file.txt
diff --git a/tests/test_pipeline_util.py b/tests/test_pipeline_util.py
@@ -1,4 +1,4 @@
-from ccbr_tools.pipeline.util import get_tmp_dir
+from ccbr_tools.pipeline.util import get_tmp_dir, _get_file_mtime
 
 
 def test_tmp_dir():
@@ -9,3 +9,8 @@ def test_tmp_dir():
             get_tmp_dir("", "./out", hpc="none") == None,
         ]
     )
+
+
+def test_get_mtime():
+    mtime = _get_file_mtime("tests/data/file.txt")
+    assert all([len(mtime) == 12, mtime.isdigit()])