Skip to content

Commit

Permalink
Merge pull request #23 from RJbalikian/azimuth
Browse files Browse the repository at this point in the history
Azimuth
  • Loading branch information
RJbalikian authored Feb 19, 2024
2 parents ffeeb78 + c767e8c commit 89ce737
Show file tree
Hide file tree
Showing 15 changed files with 2,178 additions and 768 deletions.
4 changes: 2 additions & 2 deletions conda/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package:
name: sprit
version: 0.1.65
version: 0.1.66

source:
git_url: https://github.com/RJbalikian/SPRIT-HVSR
git_tag: v0.1.65
git_tag: v0.1.66

build:
number: 0
Expand Down
6 changes: 3 additions & 3 deletions docs/generate_docs.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,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.65'
RELEASE_VERSION= '0.1.66'
RUN_TESTS=True
LINT_IT=True

Expand Down Expand Up @@ -183,6 +183,7 @@
print('Running linting')
fileList = [spritGUIPath, spritCLIPath, spritUtilsPath, spritHVSRPath]
for fileP in fileList:
print(fileP)
print(f'\nLINTING {fileP.as_posix()}')
ignoreList = ['E501']
strIgnoreList = "--ignore="+str(str(ignoreList)[1:-1].replace(' ', '').replace("'",""))
Expand All @@ -198,5 +199,4 @@
try:
subprocess.run(["python", "-m", "pytest", repoDir.as_posix()], shell=SHELL_TYPE, check=False)
except Exception:
subprocess.run(["pytest", repoDir.as_posix()], shell=SHELL_TYPE, check=False)

subprocess.run(["pytest", repoDir.as_posix()], shell=SHELL_TYPE, check=False)
685 changes: 504 additions & 181 deletions docs/main.html

Large diffs are not rendered by default.

1,440 changes: 1,063 additions & 377 deletions docs/sprit_hvsr.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/sprit_jupyter_UI.html
Original file line number Diff line number Diff line change
Expand Up @@ -1725,7 +1725,7 @@ <h1 class="title">Module <code>sprit.sprit_jupyter_UI</code></h1>
roc_kwargs = {&#39;rmse_thresh&#39;:rmse_pctile_slider.value,
&#39;use_percentile&#39;:True,
&#39;use_hv_curve&#39;:use_hv_curve_rmse.value,
&#39;show_plot&#39;:False,
&#39;show_outlier_plot&#39;:False,
&#39;verbose&#39;:verbose_check.value
}
if &#39;PPSDStatus&#39; in hvsr_data.ProcessingStatus.keys() and hvsr_data.ProcessingStatus[&#39;PPSDStatus&#39;]:
Expand Down Expand Up @@ -3972,7 +3972,7 @@ <h2 class="section-title" id="header-functions">Functions</h2>
roc_kwargs = {&#39;rmse_thresh&#39;:rmse_pctile_slider.value,
&#39;use_percentile&#39;:True,
&#39;use_hv_curve&#39;:use_hv_curve_rmse.value,
&#39;show_plot&#39;:False,
&#39;show_outlier_plot&#39;:False,
&#39;verbose&#39;:verbose_check.value
}
if &#39;PPSDStatus&#39; in hvsr_data.ProcessingStatus.keys() and hvsr_data.ProcessingStatus[&#39;PPSDStatus&#39;]:
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name = "sprit"
authors = [{name="Riley Balikian"}, {name="Hongyu Xaio"}]
dynamic = ["readme"]
license = {file = "LICENSE"}
version="0.1.65"
version="0.1.66"
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"
Expand Down
3 changes: 2 additions & 1 deletion run_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@ def test_batch():
except:
test_passed = False

assert test_passed
assert test_passed

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
name="sprit",
author= "Riley Balikian",
author_email = "[email protected]",
version="0.1.65",
version="0.1.66",
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",
Expand Down
8 changes: 7 additions & 1 deletion sprit/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

from sprit.sprit_hvsr import(
run,
azimuth,
export_data,
export_settings,
import_data,
Expand All @@ -27,6 +28,7 @@
generate_ppsds,
process_hvsr,
plot_hvsr,
read_tromino_files,
remove_noise,
remove_outlier_curves,
check_peaks,
Expand All @@ -46,7 +48,8 @@
has_required_channels,
make_it_classy,
read_from_RS,
time_it
time_it,
x_mark
)

from sprit.sprit_gui import(
Expand All @@ -59,6 +62,7 @@

__all__ =('sprit_hvsr',
'run',
'azimuth',
'check_mark',
'get_char',
'time_it',
Expand All @@ -76,6 +80,7 @@
'generate_ppsds',
'process_hvsr',
'plot_hvsr',
'read_tromino_files',
'remove_noise',
'remove_outlier_curves',
'check_peaks',
Expand All @@ -94,6 +99,7 @@
'make_it_classy',
'read_from_RS',
'time_it',
'x_mark',
'sprit_gui',
'catch_errors',
'sprit_jupyter_UI',
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 89ce737

Please sign in to comment.