update vernum

RJbalikian · Oct 17, 2023 · 1193c25 · 1193c25
1 parent fed5c2f
commit 1193c25
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 13 deletions.
diff --git a/conda/meta.yaml b/conda/meta.yaml
@@ -1,10 +1,10 @@
 package:
   name: sprit
-  version: 0.1.46
+  version: 0.1.48
 
 source:
   git_url: https://github.com/RJbalikian/SPRIT-HVSR
-  git_tag: v0.1.46
+  git_tag: v0.1.48
 
 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.46'
+release_version= '0.1.48'
 
 currentDir = pathlib.Path((__file__)).parent
 docsDir = currentDir

diff --git a/docs/main.html b/docs/main.html
@@ -1827,9 +1827,10 @@ <h2 id="returns">Returns</h2>
             params = _update_shake_metadata(filepath=invPath, params=params, write_path=write_path)
         params = _read_RS_Metadata(params, source=source)
     else:
-        if not pathlib.Path(invPath).exists() or invPath==&#39;&#39;:
+        if not invPath:
+            pass #if invPath is None
+        elif not pathlib.Path(invPath).exists() or invPath==&#39;&#39;:
             warnings.warn(f&#34;The metapath parameter was not specified correctly. Returning original params value {params[&#39;metapath&#39;]}&#34;)
-            return params
         readInvKwargs = {}
         argspecs = inspect.getfullargspec(obspy.read_inventory)
         for argName in argspecs[0]:
@@ -2364,7 +2365,7 @@ <h2 id="returns">Returns</h2>
 </details>
 </dd>
 <dt id="sprit.input_params"><code class="name flex">
-<span>def <span class="ident">input_params</span></span>(<span>datapath, site='HVSR Site', network='AM', station='RAC84', loc='00', channels=['EHZ', 'EHN', 'EHE'], acq_date='2023-10-16', starttime='00:00:00.00', endtime='23:59:59.999999', tzone='UTC', xcoord=-88.2290526, ycoord=40.1012122, elevation=755, input_crs='EPSG:4326', output_crs='EPSG:4326', elev_unit='feet', depth=0, instrument='Raspberry Shake', metapath='', hvsr_band=[0.4, 40], peak_freq_range=[0.4, 40], verbose=False)</span>
+<span>def <span class="ident">input_params</span></span>(<span>datapath, site='HVSR Site', network='AM', station='RAC84', loc='00', channels=['EHZ', 'EHN', 'EHE'], acq_date='2023-10-17', starttime='00:00:00.00', endtime='23:59:59.999999', tzone='UTC', xcoord=-88.2290526, ycoord=40.1012122, elevation=755, input_crs='EPSG:4326', output_crs='EPSG:4326', elev_unit='feet', depth=0, instrument='Raspberry Shake', metapath='', hvsr_band=[0.4, 40], peak_freq_range=[0.4, 40], verbose=False)</span>
 </code></dt>
 <dd>
 <div class="desc"><p>Function for designating input parameters for reading in and processing data</p>

diff --git a/docs/sprit_hvsr.html b/docs/sprit_hvsr.html
@@ -1558,9 +1558,10 @@ <h1 class="title">Module <code>sprit.sprit_hvsr</code></h1>
             params = _update_shake_metadata(filepath=invPath, params=params, write_path=write_path)
         params = _read_RS_Metadata(params, source=source)
     else:
-        if not pathlib.Path(invPath).exists() or invPath==&#39;&#39;:
+        if not invPath:
+            pass #if invPath is None
+        elif not pathlib.Path(invPath).exists() or invPath==&#39;&#39;:
             warnings.warn(f&#34;The metapath parameter was not specified correctly. Returning original params value {params[&#39;metapath&#39;]}&#34;)
-            return params
         readInvKwargs = {}
         argspecs = inspect.getfullargspec(obspy.read_inventory)
         for argName in argspecs[0]:
@@ -7444,9 +7445,10 @@ <h2 id="returns">Returns</h2>
             params = _update_shake_metadata(filepath=invPath, params=params, write_path=write_path)
         params = _read_RS_Metadata(params, source=source)
     else:
-        if not pathlib.Path(invPath).exists() or invPath==&#39;&#39;:
+        if not invPath:
+            pass #if invPath is None
+        elif not pathlib.Path(invPath).exists() or invPath==&#39;&#39;:
             warnings.warn(f&#34;The metapath parameter was not specified correctly. Returning original params value {params[&#39;metapath&#39;]}&#34;)
-            return params
         readInvKwargs = {}
         argspecs = inspect.getfullargspec(obspy.read_inventory)
         for argName in argspecs[0]:
@@ -7961,7 +7963,7 @@ <h2 id="returns">Returns</h2>
 </details>
 </dd>
 <dt id="sprit.sprit_hvsr.input_params"><code class="name flex">
-<span>def <span class="ident">input_params</span></span>(<span>datapath, site='HVSR Site', network='AM', station='RAC84', loc='00', channels=['EHZ', 'EHN', 'EHE'], acq_date='2023-10-16', starttime='00:00:00.00', endtime='23:59:59.999999', tzone='UTC', xcoord=-88.2290526, ycoord=40.1012122, elevation=755, input_crs='EPSG:4326', output_crs='EPSG:4326', elev_unit='feet', depth=0, instrument='Raspberry Shake', metapath='', hvsr_band=[0.4, 40], peak_freq_range=[0.4, 40], verbose=False)</span>
+<span>def <span class="ident">input_params</span></span>(<span>datapath, site='HVSR Site', network='AM', station='RAC84', loc='00', channels=['EHZ', 'EHN', 'EHE'], acq_date='2023-10-17', starttime='00:00:00.00', endtime='23:59:59.999999', tzone='UTC', xcoord=-88.2290526, ycoord=40.1012122, elevation=755, input_crs='EPSG:4326', output_crs='EPSG:4326', elev_unit='feet', depth=0, instrument='Raspberry Shake', metapath='', hvsr_band=[0.4, 40], peak_freq_range=[0.4, 40], verbose=False)</span>
 </code></dt>
 <dd>
 <div class="desc"><p>Function for designating input parameters for reading in and processing data</p>

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.46"
+version="0.1.48"
 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/setup.py b/setup.py
@@ -7,7 +7,7 @@
     name="sprit",
     author= "Riley Balikian",
     author_email = "balikian@illinois.edu",
-    version="0.1.46",
+    version="0.1.48",
     package_data={'sprit': ['resources/*', 'resources/icon/*', 'resources/themes/*', 'resources/themes/forest-dark/*', 'resources/themes/forest-light/*', 'resources/sample_data/*',]},
     long_description_content_type="text/markdown",
     long_description=long_description,

diff --git a/sprit/__pycache__/sprit_hvsr.cpython-310.pyc b/sprit/__pycache__/sprit_hvsr.cpython-310.pyc