Skip to content

Commit

Permalink
Merge pull request #1 from guzman2319/separate-restructure
Browse files Browse the repository at this point in the history
Separate restructure
  • Loading branch information
cgmorton authored Jul 23, 2019
2 parents 622c7d8 + eba62d4 commit 0b12de4
Show file tree
Hide file tree
Showing 20 changed files with 1,307 additions and 477 deletions.
6 changes: 3 additions & 3 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ The OpenET SIMS project is currently in Beta and the version numbers will be "0.
Coding Conventions
==================

OpenET SIMS was developed for Python 3.6. The code will likely work on other version of Python 3 but there are no plans to officialy support Python 2.7 at this time.
OpenET SIMS was developed for Python 3.6. The code will likely work on other version of Python 3 but there are no plans to officially support Python 2.7 at this time.

All code should follow the `PEP8
<https://www.python.org/dev/peps/pep-0008/>`__ style guide.
Expand Down Expand Up @@ -43,13 +43,13 @@ Install additional Python modules using conda (and pip for modules not currently

.. code-block:: console
conda install earthengine-api oauth2client pytest
conda install earthengine-api pytest
pip install openet-core openet-sims --no-deps
Updating OpenET Module
----------------------

While developing the sims module, pip can be used to quickly update the module in the "openet" environment if needed.
While developing the "sims" module, pip can be used to quickly update the module in the "openet" environment if needed.

.. code-block:: console
Expand Down
6 changes: 3 additions & 3 deletions examples/collection_interpolate.ipynb

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions examples/collection_overpass.ipynb

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions examples/image_mapping.ipynb

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions examples/single_image.ipynb

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion openet/sims/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .image import Image
from .collection import Collection

__version__ = "0.0.4"
__version__ = "0.0.5"
76 changes: 0 additions & 76 deletions openet/sims/ag_test_collection.py

This file was deleted.

37 changes: 0 additions & 37 deletions openet/sims/ag_test_image.py

This file was deleted.

3 changes: 2 additions & 1 deletion openet/sims/collection.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,13 @@ def __init__(
etr_band=None,
etr_factor=1.0,
filter_args=None,
# CGM - Split model_args into "image_args" and "model_args"?
model_args=None,
# model_args={'etr_source': 'IDAHO_EPSCOR/GRIDMET',
# 'etr_band': 'etr'},
# **kwargs
):
"""Earth Engine based SIMS ETcb Image Collection
"""Earth Engine based SIMS ETcb Image Collection object
Parameters
----------
Expand Down
Loading

0 comments on commit 0b12de4

Please sign in to comment.