Skip to content

Commit 202df50

Browse files
authored
Merge pull request #150 from Ocean-Data-Lab/116_prerelease
Add accumulated changes to main
2 parents bba8ced + 0ece8ff commit 202df50

File tree

16 files changed

+838
-725
lines changed

16 files changed

+838
-725
lines changed

.github/workflows/unit_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
continue-on-error: ${{ matrix.experimental }}
1313
strategy:
1414
matrix:
15-
python-version: ['3.7', '3.8', '3.9', '3.10']
15+
python-version: ['3.9', '3.10']
1616
experimental: [false]
1717
steps:
1818
- name: Checkout Repo

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ ooipy.egg-info/
1919
ooi_auth.txt
2020
.eggs
2121
_ooipy_version.py
22+
*.nc
2223

2324
# Environments
2425
.env

CITATION.cff

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ authors:
1313
given-names: "Dmitry"
1414
- family-names: "Abadi"
1515
given-names: "Shima"
16+
- family-names: "Dixit"
17+
given-names: "Anish"
1618
title: "OOIPy: A Python toolbox designed to aid in the scientific analysis of Ocean Observatories Initiative (OOI) data"
1719
version: 1.1.3
1820
doi: 10.5281/zenodo.5165389

conda_envs/py3.7.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

conda_envs/py3.8.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

ctd_demo.ipynb renamed to demos/ctd_demo.ipynb

Lines changed: 10 additions & 5 deletions
Large diffs are not rendered by default.

demos/hydrophone_demo.ipynb

Lines changed: 483 additions & 0 deletions
Large diffs are not rendered by default.

docs/source/index.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@ First Steps
2323
demos
2424

2525

26-
Modules Documentation
27-
^^^^^^^^^^^^^^^^^^^^^
26+
API Documentation
27+
^^^^^^^^^^^^^^^^^
2828
.. toctree::
2929
:maxdepth: 2
3030

3131
hydrophone
3232
ctd
3333
request
3434
tools
35+
scripts

docs/source/install_instructions.rst

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,55 @@ OOIPY is available on PyPI.
1212

1313
Install Instruction
1414
-------------------
15-
OOIPY is designed to run on Python 3.8.5. To install OOIPY, run the following command.
15+
OOIPY is designed to run on Python version 3.9 and above. To install OOIPY, run the following command:
1616

1717
.. code-block :: bash
1818
1919
pip install ooipy
2020
2121
Please see our Getting Started Guide for a tutorial on basic OOIPY usage.
22+
23+
24+
How to setup OOIPY development environment
25+
==========================================
26+
27+
1. Navigate into the folder where you wish to setup ooipy and clone the repository using this command:
28+
29+
.. code-block :: bash
30+
31+
git clone https://github.com/Ocean-Data-Lab/ooipy.git
32+
33+
2. Setup a new Conda environment using this command:
34+
35+
.. code-block :: bash
36+
37+
conda create --name env_name python=3.10 pip
38+
39+
3. Activate the environment using this command:
40+
41+
.. code-block :: bash
42+
43+
source activate env_name
44+
45+
4. Install ooipy using this command in the same directory where the repository has been cloned:
46+
47+
.. code-block :: bash
48+
49+
pip install -e ooipy
50+
51+
5. Install the development environment package requirements :
52+
53+
.. code-block :: bash
54+
55+
cd ooipy
56+
pip install -r dev-requirements.txt
57+
58+
5. When this runs successfully, open a python prompt to verify if installation is proper, using this command:
59+
60+
.. code-block :: bash
61+
62+
python
63+
import ooipy
64+
print(ooipy.__file__)
65+
66+
If the path printed out matches the __init__.py from your local installation path for the ooipy github repository, your development environment has been properly setup.

docs/source/scripts.rst

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
.. image:: ../../imgs/ooipy_banner2.png
2+
:width: 700
3+
:alt: OOIPY Logo
4+
:align: left
5+
6+
Scripts
7+
=======
8+
There are a collection of useful scripts that can be used to
9+
download and process data. The scripts are included in the package if downloaded with pypi,
10+
but can also be downloaded and run individually from the `github repo <https://github.com/Ocean-Data-Lab/ooipy/tree/master/ooipy/scripts/>`_.
11+
12+
download_hydrophone_data
13+
************************
14+
location: ooipy/scripts/download_hydrophone_data.py
15+
16+
This script downloads hydrophone data that is specified in a csv.
17+
18+
Here is an example csv file:
19+
20+
| node,start_time,end_time,file_format,downsample_factor
21+
| LJ03A,2019-08-03T08:00:00,2019-08-03T08:01:00,mat,64
22+
| AXBA1,2019-08-03T12:01:00,2019-08-03T12:02:00,mat,1
23+
24+
The script can be run with the following command:
25+
26+
.. code-block :: bash
27+
python download_hydrophone_data.py --csv <path_to_csv> --output_path <output_directory>

0 commit comments

Comments
 (0)