Skip to content

Commit 982d401

Browse files
committed
Too much
1 parent a1a11a0 commit 982d401

File tree

6 files changed

+55
-3
lines changed

6 files changed

+55
-3
lines changed

.circleci/config.yml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
version: 2.1
2+
3+
orbs:
4+
python: circleci/[email protected]
5+
6+
jobs:
7+
build_docs:
8+
executor: python/default
9+
steps:
10+
- checkout
11+
- python/install-deps
12+
- run:
13+
name: install theme
14+
command: python -m pip install --user -ve .
15+
- run:
16+
name: Build docs
17+
command: cd docs/ && make html
18+
- persist_to_workspace:
19+
root: docs/_build/html
20+
paths: .
21+
- store_artifacts:
22+
path: docs/_build/html/
23+
24+
25+
workflows:
26+
main:
27+
jobs:
28+
- build_docs

.github/workflows/doc-artifacts.yml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
on: [status]
2+
jobs:
3+
circleci_artifacts_redirector_job:
4+
runs-on: ubuntu-latest
5+
name: Run CircleCI artifacts redirector
6+
steps:
7+
- name: GitHub Action step
8+
uses: larsoner/circleci-artifacts-redirector-action@master
9+
with:
10+
repo-token: ${{ secrets.GITHUB_TOKEN }}
11+
artifact-path: 0/docs/_build/html/index.html
12+
circleci-jobs: build_docs

example-seaexplorer/deploymentRealtime.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
creator_name: Jody Klymak
1010
creator_url: http://cproof.uvic.ca
1111
# date_created etc: added automatically
12-
# numbers must be eenclosed by strings so YAML keeps as strings
12+
# numbers must be enclosed by strings so YAML keeps as strings
1313
deployment_id: '1'
1414
deployment_name: 'dfo-eva035-20190718'
1515
deployment_start: '2019-07-18'

example-slocum/process_deploymentRealTime.py

+1
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,6 @@
4646

4747
# make grid of dataset....
4848

49+
4950
outname = ncprocess.make_gridfiles(outname, griddir, deploymentyaml)
5051
pgplot.grid_plots(outname, plottingyaml)

pyglider/ncprocess.py

+8
Original file line numberDiff line numberDiff line change
@@ -219,5 +219,13 @@ def make_gridfiles(inname, outdir, deploymentyaml, dz=1):
219219

220220

221221
# aliases
222+
<<<<<<< HEAD
222223
make_L0_gridfiles = make_gridfiles
223224
extract_L0timeseries_profiles = extract_timeseries_profiles
225+
=======
226+
extract_L0timeseries_profiles = extract_timeseries_profiles
227+
make_L0_gridfiles = make_gridfiles
228+
229+
230+
__all__ = {'extract_timeseries_profiles', 'make_gridfiles'}
231+
>>>>>>> 9ccb337 (Too much)

pyglider/seaexplorer.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# -*- coding: utf-8 -*-
2+
""" Here is some documentation?
3+
"""
24
import datetime
35
import glob
46
import itertools
@@ -248,7 +250,7 @@ def _interp_pld_to_pld(pld, ds, val, indctd):
248250

249251

250252
def raw_to_timeseries(indir, outdir, deploymentyaml, kind='raw',
251-
profile_filt_time=100, profile_min_time=300):
253+
profile_filt_time=100, profile_min_time=300):
252254
"""
253255
A little different than above, for the 4-file version of the data set.
254256
"""
@@ -343,7 +345,6 @@ def raw_to_timeseries(indir, outdir, deploymentyaml, kind='raw',
343345
ds = ds.where(~np.isnan(keeps))
344346
ds = ds.dropna(dim='time', how='all')
345347

346-
347348
# some derived variables:
348349
ds = utils.get_glider_depth(ds)
349350
ds = utils.get_distance_over_ground(ds)
@@ -435,3 +436,5 @@ def _parse_sensor_config(filename):
435436

436437
active_device_dicts = {k: device_dicts[k] for k in device_dicts.keys() & {*devices}}
437438
return active_device_dicts
439+
440+
__all__ = {'raw_to_rawnc', 'merge_rawnc', 'raw_to_timeseries'}

0 commit comments

Comments
 (0)