diff --git a/.gitignore b/.gitignore index 9137d37..67cdf2c 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,7 @@ # builds for uploading to PyPI dist/ -build/ +./build/ prms_python.egg-info/ venv diff --git a/CHANGELOG.rst b/CHANGELOG.rst index ae12eb2..7f3ede4 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -9,7 +9,8 @@ module functions to align with PEP style conventions specifically: ``Kolmogorov_Smirnov`` became ``kolmogorov_smirnov`` and ``calc_emp_CDF`` became ``calc_emp_cdf``, also renamed ``util.load_data_file`` to ``util.load_data`` for consistency with ``util.load_statvar``. Name changes -are backwards compatible. +are backwards compatible. Add interactive code snippets in online documentation, +add conda environment file. Bug Fixes --------- diff --git a/LICENSE.md b/LICENSE.md index e8a894c..0bedf48 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD:license +Copyright (c) 2016-2019 John Volk and Matthew Turner +======= Copyright (c) 2016-2018 John Volk and Matt Turner +>>>>>>> 88f12cc75c3e6682f81d3724fb5681e747481b1e:LICENSE.md All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..609cc1d --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,3 @@ +include LICENSE.md +include environment.yml +graft notebooks diff --git a/README.md b/README.md index b236d6f..583810b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # PRMS-Python +[Online documentation](https://prms-python.github.io/PRMS-Python/build/html/index.html) + PRMS-Python provides a Python interface to PRMS data files and manages PRMS simulations. This module aims to improve the efficiency of PRMS workflows by giving access to PRMS data structures while providing @@ -120,10 +122,8 @@ nosetests -v We welcome anyone seriously interested in contributing to PRMS-Python to do so in anyway they see fit. If you are not sure where to begin you can look for current issues or submit a new issue [here](https://github.com/PRMS-Python/PRMS-Python/issues). You may also [fork](https://help.github.com/articles/fork-a-repo/) PRMS-Python and submit a pull request if you would like to offer your direct changes to the package. - +Volk, J. M., & Turner, M. A. (2019). PRMS-Python: A Python framework for programmatic PRMS modeling and access to its data structures. Environmental Modelling & Software, 114, 152–165. https://doi.org/10.1016/J.ENVSOFT.2019.01.006 diff --git a/docs/build/doctrees/api.doctree b/docs/build/doctrees/api.doctree index df42a3e..8a2797b 100644 Binary files a/docs/build/doctrees/api.doctree and b/docs/build/doctrees/api.doctree differ diff --git a/docs/build/doctrees/changelog.doctree b/docs/build/doctrees/changelog.doctree new file mode 100644 index 0000000..f55737a Binary files /dev/null and b/docs/build/doctrees/changelog.doctree differ diff --git a/docs/build/doctrees/citation.doctree b/docs/build/doctrees/citation.doctree new file mode 100644 index 0000000..738f147 Binary files /dev/null and b/docs/build/doctrees/citation.doctree differ diff --git a/docs/build/doctrees/cli.doctree b/docs/build/doctrees/cli.doctree index 7282414..52d167f 100644 Binary files a/docs/build/doctrees/cli.doctree and b/docs/build/doctrees/cli.doctree differ diff --git a/docs/build/doctrees/environment.pickle b/docs/build/doctrees/environment.pickle index ed0a29e..2f025a3 100644 Binary files a/docs/build/doctrees/environment.pickle and b/docs/build/doctrees/environment.pickle differ diff --git a/docs/build/doctrees/index.doctree b/docs/build/doctrees/index.doctree index c20b686..a681ab9 100644 Binary files a/docs/build/doctrees/index.doctree and b/docs/build/doctrees/index.doctree differ diff --git a/docs/build/doctrees/tutorial.doctree b/docs/build/doctrees/tutorial.doctree index c3b316f..2202e8c 100644 Binary files a/docs/build/doctrees/tutorial.doctree and b/docs/build/doctrees/tutorial.doctree differ diff --git a/docs/build/html/.buildinfo b/docs/build/html/.buildinfo index e647285..373a66a 100644 --- a/docs/build/html/.buildinfo +++ b/docs/build/html/.buildinfo @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: dbf91e9eca2226456cff78a788b52300 +config: cc68617934c1a6e4157b7bd31615fc7b tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/docs/build/html/_modules/index.html b/docs/build/html/_modules/index.html index e4bf539..1ca77de 100644 --- a/docs/build/html/_modules/index.html +++ b/docs/build/html/_modules/index.html @@ -1,44 +1,30 @@ - + - - + Overview: module code — PRMS-Python v1.0.0 + - + + + + + - - -
-
- -
+
+
-
-
+
+
+ + + + +
+
+
+ diff --git a/docs/build/html/_modules/prms_python/data.html b/docs/build/html/_modules/prms_python/data.html index cbfe3d1..d92f252 100644 --- a/docs/build/html/_modules/prms_python/data.html +++ b/docs/build/html/_modules/prms_python/data.html @@ -1,30 +1,105 @@ - + - - + prms_python.data — PRMS-Python v1.0.0 + - + + + + + - +
+ + diff --git a/docs/build/html/_modules/prms_python/optimizer.html b/docs/build/html/_modules/prms_python/optimizer.html index e4da8c5..53f7dbd 100644 --- a/docs/build/html/_modules/prms_python/optimizer.html +++ b/docs/build/html/_modules/prms_python/optimizer.html @@ -1,30 +1,105 @@ - + - - + prms_python.optimizer — PRMS-Python v1.0.0 + - + + + + + - +
+ + diff --git a/docs/build/html/_modules/prms_python/parameters.html b/docs/build/html/_modules/prms_python/parameters.html index 61fd6f4..95859c7 100644 --- a/docs/build/html/_modules/prms_python/parameters.html +++ b/docs/build/html/_modules/prms_python/parameters.html @@ -1,30 +1,105 @@ - + - - + prms_python.parameters — PRMS-Python v1.0.0 + - + + + + + - +
+ + diff --git a/docs/build/html/_modules/prms_python/scenario.html b/docs/build/html/_modules/prms_python/scenario.html index 042bfec..625013a 100644 --- a/docs/build/html/_modules/prms_python/scenario.html +++ b/docs/build/html/_modules/prms_python/scenario.html @@ -1,30 +1,105 @@ - + - - + prms_python.scenario — PRMS-Python v1.0.0 + - + + + + + - +
+ +