Merge branch 'master' into develop

usnistgov · Mar 20, 2024 · 30bbc0e · 30bbc0e
2 parents 8baa9dd + 02d7716
commit 30bbc0e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/jarvis/__init__.py b/jarvis/__init__.py
@@ -9,4 +9,4 @@ def test(*args):
     import pytest
 
     path = os.path.join(os.path.split(__file__)[0], "tests")
-    pytest.main(args=[path] + list(args))
+    pytest.main(args=[path] + list(args))
diff --git a/setup.py b/setup.py
@@ -83,4 +83,4 @@
         "Topic :: Scientific/Engineering",
     ],
     # scripts=glob.glob(os.path.join(JARVIS_DIR,  "*"))
-)
+)
-Original file line number
+Diff line change
@@ Expand Up / @@ -83,4 +83,4 @@ @@
             "Topic :: Scientific/Engineering",
         ],
         # scripts=glob.glob(os.path.join(JARVIS_DIR,  "*"))
-    )
+    )