issue with batch data, update vernum

RJbalikian · Oct 31, 2023 · fd7ecb1 · fd7ecb1
1 parent 6198f51
commit fd7ecb1
Show file tree

Hide file tree

Showing 14 changed files with 478 additions and 5,950 deletions.
diff --git a/__pycache__/run_test.cpython-311-pytest-7.4.3.pyc b/__pycache__/run_test.cpython-311-pytest-7.4.3.pyc
diff --git a/conda/meta.yaml b/conda/meta.yaml
@@ -1,10 +1,10 @@
 package:
   name: sprit
-  version: 0.1.51
+  version: 0.1.52
 
 source:
   git_url: https://github.com/RJbalikian/SPRIT-HVSR
-  git_tag: v0.1.51
+  git_tag: v0.1.52
 
 build:
   number: 0

diff --git a/docs/generate_docs.py b/docs/generate_docs.py
@@ -8,7 +8,7 @@
 #Whether to convert_md using markdown library (True), or let github do it (False)
 convert_md=True
 rtd_theme=False #Not currently working
-release_version= '0.1.51'
+release_version= '0.1.52'
 run_tests=True
 lint_it=True
 
@@ -188,8 +188,11 @@
 
 if run_tests:
     print('Testing sprit.run()')
+    shelltype=True
+    if sys.platform == 'linux':
+        shelltype = False
     try:
-        subprocess.run(["python", "-m", "pytest", repoDir.as_posix()], shell=True)
+        subprocess.run(["python", "-m", "pytest", repoDir.as_posix()], shell=shelltype)
     except:
-        subprocess.run(["pytest", repoDir.as_posix()], shell=True)
+        subprocess.run(["pytest", repoDir.as_posix()], shell=shelltype)
 
diff --git a/docs/main.html b/docs/main.html
diff --git a/docs/sprit_hvsr.html b/docs/sprit_hvsr.html
diff --git a/pyproject.toml b/pyproject.toml
@@ -7,7 +7,7 @@ name = "sprit"
 authors = [{name="Riley Balikian"}, {name="Hongyu Xaio"}]
 dynamic = ["readme"]
 license = {file = "LICENSE"}
-version="0.1.51"
+version="0.1.52"
 description = "A package for processing and analyzing HVSR (Horizontal to Vertical Spectral Ratio) data"
 keywords = ["HVSR", "seismic", "horizontal to vertical spectral ratio", "obspy", 'geology', 'geophysics', 'geotechnical']
 requires-python = ">=3.9"

diff --git a/run_test.py b/run_test.py
@@ -7,4 +7,13 @@ def test_run():
     except:
         test_passed = False
 
-    assert test_passed
+    assert test_passed
+
+def test_batch():
+    try:
+        sprit.run('sample', source='batch')
+        test_passed=True
+    except:
+        test_passed = False
+
+    assert test_passed 
diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
     name="sprit",
     author= "Riley Balikian",
     author_email = "balikian@illinois.edu",
-    version="0.1.51",
+    version="0.1.52",
     package_data={'sprit': ['resources/*', 'resources/icon/*', 'resources/themes/*', 'resources/themes/forest-dark/*', 
                             'resources/themes/forest-light/*', 'resources/sample_data/*','resources/settings/*']},
     long_description_content_type="text/markdown",

diff --git a/sprit/__pycache__/__init__.cpython-311.pyc b/sprit/__pycache__/__init__.cpython-311.pyc
diff --git a/sprit/__pycache__/sprit_cli.cpython-311.pyc b/sprit/__pycache__/sprit_cli.cpython-311.pyc
diff --git a/sprit/__pycache__/sprit_gui.cpython-311.pyc b/sprit/__pycache__/sprit_gui.cpython-311.pyc
diff --git a/sprit/__pycache__/sprit_hvsr.cpython-311.pyc b/sprit/__pycache__/sprit_hvsr.cpython-311.pyc
diff --git a/sprit/__pycache__/sprit_utils.cpython-311.pyc b/sprit/__pycache__/sprit_utils.cpython-311.pyc
diff --git a/sprit/sprit_hvsr.py b/sprit/sprit_hvsr.py