From e7abfe77cd72828aa10d7851bb4a583a36ab8b9a Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Mon, 24 Oct 2022 15:38:12 -0300 Subject: [PATCH 1/3] run doctests --- .github/workflows/tests.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index bd5b0c5..9912662 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -34,3 +34,9 @@ jobs: run: | micromamba activate TEST python -m pytest -rxs tests + + - name: Doctests + shell: bash -l {0} + run: | + micromamba activate TEST + python -m pytest -s -rxs --doctest-modules -vv ctd From bdd641cb8be7a3395a850a6113d915b251cb35b2 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Mon, 24 Oct 2022 15:38:22 -0300 Subject: [PATCH 2/3] remove executable bits --- tests/data/castaway_data.csv | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 tests/data/castaway_data.csv diff --git a/tests/data/castaway_data.csv b/tests/data/castaway_data.csv old mode 100755 new mode 100644 From ad1cce7178e5195798ed3adc345752655e0a31c9 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Mon, 24 Oct 2022 15:39:39 -0300 Subject: [PATCH 3/3] fix castaway import --- ctd/__init__.py | 11 ++++++++++- ctd/read.py | 8 ++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ctd/__init__.py b/ctd/__init__.py index 489b9df..88076fc 100644 --- a/ctd/__init__.py +++ b/ctd/__init__.py @@ -15,7 +15,15 @@ smooth, split, ) -from .read import from_bl, from_btl, from_cnv, from_edf, from_fsi, rosette_summary +from .read import ( + from_bl, + from_btl, + from_castaway_csv, + from_cnv, + from_edf, + from_fsi, + rosette_summary, +) try: from ._version import __version__ @@ -28,6 +36,7 @@ "despike", "from_bl", "from_btl", + "from_castaway_csv", "from_cnv", "from_edf", "from_fsi", diff --git a/ctd/read.py b/ctd/read.py index 773cebb..c0544f5 100644 --- a/ctd/read.py +++ b/ctd/read.py @@ -522,10 +522,10 @@ def from_castaway_csv(fname): -------- >>> import ctd >>> cast = ctd.from_castaway_csv('tests/data/castaway_data.csv') - >>> downcast, upcast = cast.split() # Upcast often prefiltered - >>> fig, ax = plt.subplots() - >>> ax = downcast['temperature'].plot_cast() - >>> fig.show() + >>> cast.columns + Index(['depth', 'temperature', 'conductivity', 'specific_conductance', + 'salinity', 'sound_velocity', 'density'], + dtype='object') """ with open(fname) as file: