Skip to content

Commit

Permalink
update docs, vernum, and make it -dev version
Browse files Browse the repository at this point in the history
  • Loading branch information
RJbalikian committed Mar 7, 2024
1 parent 6643e5a commit e0aa4f0
Show file tree
Hide file tree
Showing 10 changed files with 1,596 additions and 531 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
.vscode
testnotebook.ipynb
cache/
__pycache__
w4h/__pycache__/
w4h/resources/sample_data/Output*
2 changes: 0 additions & 2 deletions docs/classify.html
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ <h1 class="title">Module <code>w4h.classify</code></h1>

return df_Interps


def split_defined(df, classification_col=&#39;CLASS_FLAG&#39;, verbose=False, log=False):
&#34;&#34;&#34;Function to split dataframe with well descriptions into two dataframes based on whether a row has been classified.

Expand Down Expand Up @@ -384,7 +383,6 @@ <h1 class="title">Module <code>w4h.classify</code></h1>
return df_targ

#Function to get unique wells

def get_unique_wells(df, wellid_col=&#39;API_NUMBER&#39;, verbose=False, log=False):
&#34;&#34;&#34;Gets unique wells as a dataframe based on a given column name.

Expand Down
621 changes: 539 additions & 82 deletions docs/core.html

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion docs/export.html
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ <h1 class="title">Module <code>w4h.export</code></h1>
print(&#39;Exported &#39;+fname+nowTimeStr+&#39;.csv&#39;)

#Export (rio)xarray dataarrays and datasets

def export_grids(grid_data, out_path, file_id=&#39;&#39;,filetype=&#39;tif&#39;, variable_sep=True, date_stamp=True, verbose=False, log=False):
&#34;&#34;&#34;Function to export grids to files.

Expand Down
2 changes: 1 addition & 1 deletion docs/generate_docs.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
RTD_THEME=False #Not currently working
RUN_TESTS=True
LINT_IT=False
RELEASE_VERSION = "0.0.19"
RELEASE_VERSION = "0.0.20-dev"

# Set the filepaths
currentDir = pathlib.Path((__file__)).parent
Expand Down
908 changes: 692 additions & 216 deletions docs/main.html

Large diffs are not rendered by default.

506 changes: 305 additions & 201 deletions docs/mapping.html

Large diffs are not rendered by default.

82 changes: 56 additions & 26 deletions docs/read.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
name = "wells4hydrogeology"
dynamic = ["readme"]
license = {file = "LICENSE"}
version="0.0.19"
version="0.0.20-dev"
description = "A package to read in geology data from wells and create a layered, gridded hydrogeologic model of a study region, all within a python environment, automating and performing tasks often carried out in a dedicated GIS software."
keywords = ["hydrogeology", "modflow", "water wells", "geology", 'water', 'geotechnical']
requires-python = "<3.13, >=3.9"
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
name="wells4hydrogeology",
author= "Riley Balikian",
author_email = "balikian@illinois.edu",
version="0.0.19",
version="0.0.20-dev",
package_data={'w4h': ['resources/*', 'resources/sample_data/*', 'resources/sample_data/statewide_sample_data/*',
'resources/sample_data/DictionaryTerms/*','resources/sample_data/LithologyInterpretations/*']},
install_requires=["geopandas", "rioxarray", "owslib", "scipy", "matplotlib", "pandas", "numpy"],
Expand Down

0 comments on commit e0aa4f0

Please sign in to comment.