Merge branch 'master' into develop

usnistgov · Oct 18, 2024 · abfc360 · abfc360
2 parents 6458998 + 7f2f2bf
commit abfc360
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/docs/databases.md b/docs/databases.md
@@ -100,4 +100,4 @@ print(df)
 
 [Open in SLMat]: https://img.shields.io/badge/Open-SLMat-blue
 
-[Open in Colab]: https://colab.research.google.com/assets/colab-badge.svg
+[Open in Colab]: https://colab.research.google.com/assets/colab-badge.svg
diff --git a/jarvis/__init__.py b/jarvis/__init__.py
@@ -10,4 +10,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/jarvis/analysis/structure/spacegroup.py b/jarvis/analysis/structure/spacegroup.py
@@ -738,4 +738,4 @@ def check_duplicate_coords(coords=[], coord=[]):
     # spg=SpacegroupAnalyzer(pmg)
     # print (spg.get_space_group_symbol(),spg.get_space_group_number())
     # print (pmg.get_primitive_structure())
-"""
+"""
diff --git a/setup.py b/setup.py
@@ -86,4 +86,4 @@
         "Topic :: Scientific/Engineering",
     ],
     # scripts=glob.glob(os.path.join(JARVIS_DIR,  "*"))
-)
+)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -100,4 +100,4 @@ print(df)

		[Open in SLMat]: https://img.shields.io/badge/Open-SLMat-blue

		[Open in Colab]: https://colab.research.google.com/assets/colab-badge.svg
		[Open in Colab]: https://colab.research.google.com/assets/colab-badge.svg
-Original file line number
+Diff line change
@@ Expand Up / @@ -86,4 +86,4 @@ @@
             "Topic :: Scientific/Engineering",
         ],
         # scripts=glob.glob(os.path.join(JARVIS_DIR,  "*"))
-    )
+    )