Skip to content

Commit

Permalink
vernum update (not docs), and minor parameter update
Browse files Browse the repository at this point in the history
  • Loading branch information
RJbalikian committed Oct 30, 2024
1 parent b231e49 commit 44168db
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion docs/_generate_docs.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import markdown


RELEASE_VERSION = "1.4.1"
RELEASE_VERSION = "1.4.2"

VERBOSE = True

Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
project = 'sprit'
copyright = '2024, Author'
author = 'Riley Balikian'
release = '1.4.1'
release = '1.4.2'

# -- General configuration ---------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
Expand Down
70 changes: 35 additions & 35 deletions docs/make.bat
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
@ECHO OFF

pushd %~dp0

REM Command file for Sphinx documentation

if "%SPHINXBUILD%" == "" (
set SPHINXBUILD=sphinx-build
)
set SOURCEDIR=.
set BUILDDIR=_build

%SPHINXBUILD% >NUL 2>NUL
if errorlevel 9009 (
echo.
echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
echo.installed, then set the SPHINXBUILD environment variable to point
echo.to the full path of the 'sphinx-build' executable. Alternatively you
echo.may add the Sphinx directory to PATH.
echo.
echo.If you don't have Sphinx installed, grab it from
echo.https://www.sphinx-doc.org/
exit /b 1
)

if "%1" == "" goto help

%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
goto end

:help
%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%

:end
popd
@ECHO OFF

pushd %~dp0

REM Command file for Sphinx documentation

if "%SPHINXBUILD%" == "" (
set SPHINXBUILD=sphinx-build
)
set SOURCEDIR=.
set BUILDDIR=_build

%SPHINXBUILD% >NUL 2>NUL
if errorlevel 9009 (
echo.
echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
echo.installed, then set the SPHINXBUILD environment variable to point
echo.to the full path of the 'sphinx-build' executable. Alternatively you
echo.may add the Sphinx directory to PATH.
echo.
echo.If you don't have Sphinx installed, grab it from
echo.https://www.sphinx-doc.org/
exit /b 1
)

if "%1" == "" goto help

%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
goto end

:help
%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%

:end
popd
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ sphinx
markdown
pytest
flake8
sprit==1.4.1
sprit==1.4.2
4 changes: 2 additions & 2 deletions 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="1.4.1"
version="1.4.2"
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 All @@ -24,7 +24,7 @@ classifiers = [

[tool.poetry]
name='SpRIT Streamlit'
version="1.4.1"
version="1.4.2"
description = "A package for processing and analyzing HVSR (Horizontal to Vertical Spectral Ratio) data"
authors = ["Riley Balikian <[email protected]>"]
license = "MIT"
Expand Down
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="1.4.1",
version="1.4.2",
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: 4 additions & 4 deletions sprit/sprit_hvsr.py
Original file line number Diff line number Diff line change
Expand Up @@ -3684,7 +3684,7 @@ def import_settings(settings_import_path, settings_import_type='instrument', ver
# Define input parameters
def input_params(input_data,
site='HVSR Site',
id_prefix=None,
project=None,
network='AM',
station='RAC84',
loc='00',
Expand Down Expand Up @@ -3715,11 +3715,11 @@ def input_params(input_data,
Filepath of data. This can be a directory or file, but will need to match with what is chosen later as the source parameter in fetch_data()
site : str, default="HVSR Site"
Site name as designated by user for ease of reference. Used for plotting titles, filenames, etc.
id_prefix : str, default=None
project : str, default=None
A prefix that may be used to create unique identifiers for each site.
The identifier created is saved as the ['HVSR_ID'] attribute of the HVSRData object,
and is equivalent to the following formatted string:
f"{id_prefix}-{acq_date.strftime("%Y%m%d")}-{starttime.strftime("%H%M")}-{station}".
f"{project}-{acq_date.strftime("%Y%m%d")}-{starttime.strftime("%H%M")}-{station}".
network : str, default='AM'
The network designation of the seismometer. This is necessary for data from Raspberry Shakes. 'AM' is for Amateur network, which fits Raspberry Shakes.
station : str, default='RAC84'
Expand Down Expand Up @@ -3928,7 +3928,7 @@ def input_params(input_data,
update_msg.append(f"\t\thvsr_id generated from input parameters: {hvsr_id}")

#Add key/values to input parameter dictionary for use throughout the rest of the package
inputParamDict = {'site':site, 'id_prefix':id_prefix, 'hvsr_id':hvsr_id, 'network':network, 'station':station,'location':loc, 'channels':channels,
inputParamDict = {'site':site, 'project':project, 'hvsr_id':hvsr_id, 'network':network, 'station':station,'location':loc, 'channels':channels,
'net':network,'sta':station, 'loc':loc, 'cha':channels, 'instrument':instrument,
'acq_date':acq_date,'starttime':starttime,'endtime':endtime, 'timezone':'UTC', #Will be in UTC by this point
'xcoord':xcoord, 'ycoord':ycoord, 'longitude':xcoord_wgs84,'latitude':ycoord_wgs84,
Expand Down

0 comments on commit 44168db

Please sign in to comment.