Skip to content

Commit fe57c41

Browse files
authored
Merge pull request #204 from icesat2py/development
v0.4.0 release: visualization module and orbital parameter search
2 parents 81af082 + f700934 commit fe57c41

36 files changed

+1642
-295
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ venv.bak/
107107

108108
# downloaded data
109109
/download/
110+
/examples/download
110111

111112
# directory files
112113
.DS_Store

.travis.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,28 @@
11
language: python
22

3+
before_install:
4+
- sudo apt-get update
5+
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
6+
- bash miniconda.sh -b -p $HOME/miniconda
7+
- export PATH="$HOME/miniconda/bin:$PATH"
8+
- hash -r
9+
- conda config --set always_yes yes --set changeps1 no
10+
- conda update -q conda
11+
# Useful for debugging any issues with conda
12+
- conda info -a
13+
314
install:
15+
- conda create --name icepyx-env --channel conda-forge python=$TRAVIS_PYTHON_VERSION proj=7.2.0 geos
16+
- source activate icepyx-env
17+
418
- pip install -r requirements.txt -r requirements-dev.txt
5-
- pip install -e .
19+
- pip install -e .[complete]
620

721
stages:
822
- name: basic tests
9-
if: (type = pull_request) OR (type = push AND repo = icesat2py/icepyx AND branch IN (master, development))
23+
if: (type = pull_request) OR (type = push AND repo = icesat2py/icepyx AND branch IN (main, development))
1024
- name: behind Earthdata
11-
if: branch = master OR commit_message =~ nsidc_tests OR type = cron
25+
if: branch = main OR commit_message =~ nsidc_tests OR type = cron
1226

1327
#ultimately move basic tests list into a separate script with the list of files to run (then this can be put into a matrix and parallellized as well)
1428
jobs:

ATTRIBUTION.rst

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
.. _attribution_ref_label:
2+
23
Attribution Guidelines
34
======================
45

56
We are extremely grateful to everyone who has contributed to the success of the icepyx community, whether through direct contributions to or feedback about icepyx or as developers or maintainers of complimentary resources that are included within the icepyx ecosystem. This document outlines our goals to give appropriate attribution to all contributors to icepyx in ways that are fair and diverse and supportive of professional goals. To do so, we define broadly *contributions* as:
67

78
Efforts towards achieving icepyx's goals, including writing code, tests, or documentation,
8-
development of example workflows, development, significant contributions, or maintenance of
9-
a tailored package that broadens the functionality of icepyx, feedback and suggestions,
9+
development of example workflows, development, significant contributions, or maintenance of
10+
a tailored package that broadens the functionality of icepyx, feedback and suggestions,
1011
community building, etc.
11-
12+
1213
We use the terms "contributors", "developers", and "authors" interchangeably. We will recognize contributions in the following ways.
1314

1415
Contributors List
@@ -39,11 +40,11 @@ Authorship on scientific papers currently constitutes an important metric for as
3940
2. Add themself to the `Contributors List`_.
4041
3. Contribute ideas, participate in authorship discussions (see next paragraph), write, read, and review the manuscript in a timely manner, and provide feedback (acknowledgement of review is sufficient, but we'd prefer more).
4142

42-
Author order will be determined based on co-author discussion, led by the lead author, during the initial planning stages of manuscript preparation (i.e. as soon as an idea matures into a potential manuscript and before writing begins). Authorship will continue to be evaluated throughout the manuscript preparation process. Discussions will consider authorship norms (e.g. How does author order convey participation and prestige? How critical is first authorship to career advancement for each member of the team? Do an individual's contributions meet authorship criteria or are they more suited to acknowledgements?). Author order determination will also consider metrics such as the number of commits since the last major release with an associated paper (``git shortlog vX.0.0...HEAD -sne``), contributions that do not have associated commits, and contributions to the preparation of the manuscript.
43+
Author order will be determined based on co-author discussion, led by the lead author, during the initial planning stages of manuscript preparation (i.e. as soon as an idea matures into a potential manuscript and before writing begins). Authorship will continue to be evaluated throughout the manuscript preparation process. Discussions will consider authorship norms (e.g. How does author order convey participation and prestige? How critical is first authorship to career advancement for each member of the team? Do an individual's contributions meet authorship criteria or are they more suited to acknowledgements?). Author order determination will also consider metrics such as the number of commits since the last major release with an associated paper (``git shortlog vX.0.0...HEAD -sne``), contributions that do not have associated commits, and contributions to the preparation of the manuscript.
4344

4445

4546

46-
Disclaimer: These policies are not permanent or fixed and may change to accomodate community growth,
47+
Disclaimer: These policies are not permanent or fixed and may change to accomodate community growth,
4748
best practices, and feedback.
4849

49-
Copyright notice: This document was inspired by the `authorship guidelines <https://github.com/fatiando/contributing/blob/master/AUTHORSHIP.md>`_ provided by `Fatiando a Terra <https://github.com/fatiando>`_ and encourages potential co-authors to consider the resources provided by the `NASA High Mountain Asia Team (HiMAT) <https://highmountainasia.github.io/team-collaboration/authorship/>`_.
50+
Copyright notice: This document was inspired by the `authorship guidelines <https://github.com/fatiando/contributing/blob/master/AUTHORSHIP.md>`_ provided by `Fatiando a Terra <https://github.com/fatiando>`_ and encourages potential co-authors to consider the resources provided by the `NASA High Mountain Asia Team (HiMAT) <https://highmountainasia.github.io/team-collaboration/authorship/>`_.

CONTRIBUTORS.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ order by last name) and are considered "The icepyx Developers":
2222
* `David Shean <https://github.com/dshean>`_ - University of Washington
2323
* `Ben Smith <https://github.com/smithb>`_ - University of Washington
2424
* `Amy Steiker <https://github.com/asteiker>`_ - NSIDC, University of Colorado
25+
* `Tyler Sutterley <https://github.com/tsutterley>`_ - University of Washington
2526
* `Anna Valentine <https://github.com/annavalentine>`_ - Colorado School of Mines
2627
* `Bruce Wallin <https://github.com/wallinb>`_ - NSIDC, University of Colorado
2728
* `Molly Wieringa <https://github.com/mollymwieringa>`_ - University of Washington

README.rst

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,25 @@ icepyx
33

44
**Python tools for obtaining and working with ICESat-2 data**
55

6-
|Documentation Status| |GitHub license| |Travis CI Status| |Code Coverage|
6+
|Documentation Status| |GitHub license| |Travis CI Status| |Code Coverage| |Conda install| |Pypi install|
77

88
.. |Documentation Status| image:: https://readthedocs.org/projects/icepyx/badge/?version=latest
99
:target: http://icepyx.readthedocs.io/?badge=latest
1010

1111
.. |GitHub license| image:: https://img.shields.io/badge/License-BSD%203--Clause-blue.svg
1212
:target: https://opensource.org/licenses/BSD-3-Clause
1313

14-
.. |Travis CI Status| image:: https://travis-ci.org/icesat2py/icepyx.svg?branch=master
14+
.. |Travis CI Status| image:: https://travis-ci.org/icesat2py/icepyx.svg?branch=development
1515
:target: https://travis-ci.org/icesat2py/icepyx
1616

17-
.. |Code Coverage| image:: https://codecov.io/gh/icesat2py/icepyx/branch/development/graph/badge.svg
17+
.. |Code Coverage| image:: https://codecov.io/gh/icesat2py/icepyx/branch/development/graph/badge.svg
1818
:target: https://codecov.io/gh/icesat2py/icepyx
19+
20+
.. |Conda install| image:: https://anaconda.org/conda-forge/icepyx/badges/installer/conda.svg
21+
:target: https://anaconda.org/conda-forge/icepyx
22+
23+
.. |Pypi install| image:: https://badge.fury.io/py/icepyx.svg
24+
:target: https://pypi.org/project/icepyx/
1925

2026
Origin and Purpose
2127
------------------
@@ -28,19 +34,19 @@ at the University of Washington in June 2019 or as scripts written and used by t
2834
This project combines and generalizes these scripts into a unified framework, making them accessible for everyone.
2935

3036

31-
.. _`zipped file`: https://github.com/icesat2py/icepyx/archive/master.zip
37+
.. _`zipped file`: https://github.com/icesat2py/icepyx/archive/main.zip
3238
.. _`Fiona`: https://pypi.org/project/Fiona/
3339

3440
Installation
3541
------------
3642

3743
The simplest way to install icepyx is by using the
3844
`conda <https://docs.conda.io/projects/conda/en/latest/user-guide/index.html>`__
39-
package manager.
40-
45+
package manager. |Conda install|
46+
4147
conda install icepyx
4248

43-
Alternatively, you can also install icepyx using `pip <https://pip.pypa.io/en/stable/>`__.
49+
Alternatively, you can also install icepyx using `pip <https://pip.pypa.io/en/stable/>`__. |Pypi install|
4450

4551
pip install icepyx
4652

@@ -53,12 +59,13 @@ Examples (Jupyter Notebooks)
5359

5460
Listed below are example jupyter-notebooks
5561

56-
`ICESat-2_DAAC_DataAccess_Example <https://github.com/icesat2py/icepyx/blob/master/examples/ICESat-2_DAAC_DataAccess_Example.ipynb>`_
62+
`ICESat-2_DAAC_DataAccess_Example <https://github.com/icesat2py/icepyx/blob/main/examples/ICESat-2_DAAC_DataAccess_Example.ipynb>`_
5763

58-
`ICESat-2_DAAC_DataAccess2_Subsetting <https://github.com/icesat2py/icepyx/blob/master/examples/ICESat-2_DAAC_DataAccess2_Subsetting.ipynb>`_
64+
`ICESat-2_DAAC_DataAccess2_Subsetting <https://github.com/icesat2py/icepyx/blob/main/examples/ICESat-2_DAAC_DataAccess2_Subsetting.ipynb>`_
5965

60-
`ICESat-2_DEM_comparison_Colombia_working <https://github.com/icesat2py/icepyx/blob/master/examples/ICESat-2_DEM_comparison_Colombia_working.ipynb>`_
66+
`ICESat-2_DEM_comparison_Colombia_working <https://github.com/icesat2py/icepyx/blob/main/examples/ICESat-2_DEM_comparison_Colombia_working.ipynb>`_
6167

68+
`ICESat-2 Data Visualization Example <https://github.com/icesat2py/icepyx/blob/main/examples/ICESat-2_Data_Visualization_Example.ipynb>`_
6269

6370
Citing icepyx
6471
-------------

doc/source/community/contact.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.. _contact_ref_label:
2+
23
Contact Us
34
==========
45

@@ -20,4 +21,4 @@ We meet on:
2021

2122
Additional information about logging in to the meetings can be found on `this Discourse post <https://discourse.pangeo.io/t/icepyx-team-meetings/722/2?u=jessicas11>`_.
2223

23-
Absolutely NO previous software development experience is necessary to attend any meeting. Think of them more like coffee hour mixed with office hours than a conference call. We look forward to seeing you there!
24+
Absolutely NO previous software development experience is necessary to attend any meeting. Think of them more like coffee hour mixed with office hours than a conference call. We look forward to seeing you there!

doc/source/community/resources.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.. _resource_ref_label:
2+
23
ICESat-2 Open-Source Resources Guide
34
====================================
45

@@ -11,7 +12,7 @@ Resources Used in the Initial Development of icepyx
1112

1213
First ICESat-2 Cryospheric Hackweek at the University of Washington (June 2019)
1314
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
14-
This June 2019 event resulted in the production of a series of `tutorials <https://github.com/ICESAT-2HackWeek/ICESat2_hackweek_tutorials>`_, developed primarily by members of the ICESat-2 Science Team and early data users, aimed at educating the cryospheric community in obtaining and using ICESat-2 datasets. During the actual Hackweek, teams of researchers and data scientists developed a series of interesting `projects <https://github.com/ICESAT-2HackWeek/projects_2019>`_ related to their interests/research.
15+
This June 2019 event resulted in the production of a series of `tutorials <https://github.com/ICESAT-2HackWeek/ICESat2_hackweek_tutorials>`_, developed primarily by members of the ICESat-2 Science Team and early data users, aimed at educating the cryospheric community in obtaining and using ICESat-2 datasets. During the actual Hackweek, teams of researchers and data scientists developed a series of interesting `projects <https://github.com/ICESAT-2HackWeek/projects_2019>`_ related to their interests/research.
1516

1617
The available tutorials, most of which contain one or more Jupyter Notebooks to illustrate concepts, are listed below. Additional information for citing (including licensing) and running (e.g. through a Pangeo Binder) these tutorials can be found at the above link.
1718

@@ -91,7 +92,7 @@ Here we describe a selection of publicly available Python code posted on GitHub
9192

9293
- `Nsidc-subsetter <https://github.com/tsutterley/nsidc-subsetter>`_
9394

94-
- by Tyler Sutterly
95+
- by Tyler Sutterley
9596
- Retrieve IceBridge, ICESat, and ICESat-2 data using the NSIDC subsetter API
9697
- Command line tool
9798
- Download data and convert it into a georeferenced format (e.g. geojson, kml, or shapefile)
@@ -117,7 +118,7 @@ icepyx aims to provide intuitive, object-based methods for finding, obtaining, v
117118

118119
- Collaboration between NSIDC, Scripps, and San Diego Supercomputer Center
119120
- Enables data browsing on a map and selection of tracks and interactive data exploration for the higher level ICESat-2 datasets (i.e. ATL06+)
120-
121+
121122

122123
Ongoing Efforts
123124
----------------

doc/source/contributing/contribution_guidelines.rst

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,11 @@ We are delighted you'd like to contribute your `icepyx <https://github.com/icesa
5151

5252
Contributing Code
5353
-----------------
54-
We follow a standard git workflow for code changes and additions. All submitted code, including our own, goes through the pull request process; no changes are pushed directly to the *master* or *development* branches. This allows our continuous integration (testing) process to ensure that the code is up to our standards and passes all of our tests (i.e. doesn't break what's already there and working). By having a *development* branch for daily work, we enable the *master* branch to remain stable between releases even as new features are being added.
54+
We follow a standard git workflow for code changes and additions.
55+
All submitted code, including our own, goes through the pull request process;
56+
no changes are pushed directly to the *main* or *development* branches.
57+
This allows our continuous integration (testing) process to ensure that the code is up to our standards and passes all of our tests (i.e. doesn't break what's already there and working).
58+
By having a *development* branch for daily work, we enable the *main* branch to remain stable between releases even as new features are being added.
5559

5660
First Steps
5761
^^^^^^^^^^^
@@ -77,7 +81,7 @@ We encourage users to follow the `git pull request workflow <https://www.asmeure
7781
- Fork the repo to your personal GitHub account
7882
- Add your fork as a remote
7983
- Add yourself to `CONTRIBUTORS.rst` (see `Attribution for Contributions`_)
80-
84+
8185
(each time you are going to make changes)
8286

8387
- Update the development branch
@@ -101,4 +105,4 @@ Discovered a currently untested case? Please share your test, either by creating
101105

102106
Attribution for Contributions
103107
-----------------------------
104-
We appreciate any and all contributions made to icepyx, direct or indirect, large or small. To learn more about how you will be recognized for your contributions, please see our :ref:`Attribution Guidelines <attribution_ref_label>`.
108+
We appreciate any and all contributions made to icepyx, direct or indirect, large or small. To learn more about how you will be recognized for your contributions, please see our :ref:`Attribution Guidelines <attribution_ref_label>`.

doc/source/getting_started/install.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11

22

33

4-
.. _`zipped file`: https://github.com/icesat2py/icepyx/archive/master.zip
4+
.. _`zipped file`: https://github.com/icesat2py/icepyx/archive/main.zip
55
.. _`Fiona`: https://pypi.org/project/Fiona/
66

77

88

9-
109
Installation
1110
============
1211

@@ -25,7 +24,7 @@ To activate the virtual environment, you can do::
2524
conda activate icepyx-env
2625

2726

28-
Using conda
27+
Using conda
2928
-----------
3029

3130
If you already have a virtual conda environment set up and activated, you can
@@ -40,7 +39,7 @@ To upgrade an installed version of icepyx to the latest stable release, do::
4039

4140

4241

43-
Using pip
42+
Using pip
4443
---------
4544

4645
Alternatively, you can also install icepyx using `pip <https://pip.pypa.io/en/stable/>`__.

doc/source/index.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,14 @@ icepyx is both a software library and a community composed of ICESat-2 data user
4545
community/resources
4646
community/contact
4747
tracking/tracking
48+
49+
**Quick Install**
50+
51+
.. |Conda install| image:: https://anaconda.org/conda-forge/icepyx/badges/installer/conda.svg
52+
:target: https://anaconda.org/conda-forge/icepyx
53+
54+
.. |Pypi install| image:: https://badge.fury.io/py/icepyx.svg
55+
:target: https://pypi.org/project/icepyx/
56+
57+
|Conda install| |Pypi install|
58+

0 commit comments

Comments
 (0)