From d9e72a5e4cb8066e37a9fca67b724428c0100c29 Mon Sep 17 00:00:00 2001 From: Xavier Hoenner Date: Fri, 6 Sep 2024 14:03:16 +1000 Subject: [PATCH 1/3] Delete data associated with NaN lat/long coordinates --- AODN/AODN-WAVE-NRT/ARDC_API_NRT/ardc_nrt/ardc_sofar_nrt.py | 1 + 1 file changed, 1 insertion(+) diff --git a/AODN/AODN-WAVE-NRT/ARDC_API_NRT/ardc_nrt/ardc_sofar_nrt.py b/AODN/AODN-WAVE-NRT/ARDC_API_NRT/ardc_nrt/ardc_sofar_nrt.py index 17f7c889..3a262409 100755 --- a/AODN/AODN-WAVE-NRT/ARDC_API_NRT/ardc_nrt/ardc_sofar_nrt.py +++ b/AODN/AODN-WAVE-NRT/ARDC_API_NRT/ardc_nrt/ardc_sofar_nrt.py @@ -67,6 +67,7 @@ def process_wave_source_id(source_id, incoming_path=None): return if data is not None: + data = data[data['latitude'].notnull()] template_dirpath = config.conf_dirpath process_wave_dataframe(data, source_id, template_dirpath, OUTPUT_PATH, incoming_path) From 06969cc4f401474d857736920e02f077d382d9a0 Mon Sep 17 00:00:00 2001 From: Xavier Hoenner Date: Tue, 1 Oct 2024 11:58:05 +1000 Subject: [PATCH 2/3] Refine PR --- AODN/AODN-WAVE-NRT/ARDC_API_NRT/ardc_nrt/ardc_sofar_nrt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AODN/AODN-WAVE-NRT/ARDC_API_NRT/ardc_nrt/ardc_sofar_nrt.py b/AODN/AODN-WAVE-NRT/ARDC_API_NRT/ardc_nrt/ardc_sofar_nrt.py index 3a262409..82de7be6 100755 --- a/AODN/AODN-WAVE-NRT/ARDC_API_NRT/ardc_nrt/ardc_sofar_nrt.py +++ b/AODN/AODN-WAVE-NRT/ARDC_API_NRT/ardc_nrt/ardc_sofar_nrt.py @@ -67,7 +67,7 @@ def process_wave_source_id(source_id, incoming_path=None): return if data is not None: - data = data[data['latitude'].notnull()] + data = data.dropna(subset = ['latitude', 'longitude'], how = 'all') # Remove rows associated with NAs for lat/long columns template_dirpath = config.conf_dirpath process_wave_dataframe(data, source_id, template_dirpath, OUTPUT_PATH, incoming_path) From 79f41e20241d9b8ba60ff1eba24d18da061fe52a Mon Sep 17 00:00:00 2001 From: Xavier Hoenner Date: Tue, 1 Oct 2024 12:26:08 +1000 Subject: [PATCH 3/3] Fix Github action files --- .github/workflows/test_ardc_nrt.yml | 3 +++ .github/workflows/test_data_services.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/test_ardc_nrt.yml b/.github/workflows/test_ardc_nrt.yml index d13eae8e..5ff1e439 100755 --- a/.github/workflows/test_ardc_nrt.yml +++ b/.github/workflows/test_ardc_nrt.yml @@ -24,11 +24,14 @@ jobs: with: activate-environment: ardc_nrt environment-file: AODN/AODN-WAVE-NRT/ARDC_API_NRT/environment.yml + auto-activate-base: false # Prevent activating base env - name: Install dependencies shell: bash -el {0} run: | conda install --yes mamba + mamba env create --name ardc_nrt --file environment.yml || true # Create only if not exists + conda activate ardc_nrt mamba env update --name ardc_nrt --file AODN/AODN-WAVE-NRT/ARDC_API_NRT/environment.yml - name: Activate Conda environment diff --git a/.github/workflows/test_data_services.yml b/.github/workflows/test_data_services.yml index c19807a4..ced89f4c 100755 --- a/.github/workflows/test_data_services.yml +++ b/.github/workflows/test_data_services.yml @@ -24,11 +24,14 @@ jobs: with: activate-environment: data_services_3.8 environment-file: environment.yml + auto-activate-base: false # Prevent activating base env - name: Install dependencies shell: bash -el {0} run: | conda install --yes mamba + mamba env create --name data_services_3.8 --file environment.yml || true # Create only if not exists + conda activate data_services_3.8 mamba env update --name data_services_3.8 --file environment.yml - name: Activate Conda environment