From 51eb78871ac82a801ccfda41e915021485190920 Mon Sep 17 00:00:00 2001 From: Calum Meikle Date: Wed, 23 Apr 2025 12:55:39 +0200 Subject: [PATCH 1/5] Adding gitlab pipeline yaml file --- .gitlab-ci.yml | 3 +++ run/run_tropomi.py | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..14432229 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,3 @@ +pytest: + stage: test + script: pytest mapies/tests/* \ No newline at end of file diff --git a/run/run_tropomi.py b/run/run_tropomi.py index 93f97fd2..034a9ff6 100644 --- a/run/run_tropomi.py +++ b/run/run_tropomi.py @@ -13,13 +13,13 @@ if __name__ == "__main__": start_time = time.time() - c = TROPOMI(start_date, end_date, dest=outdir, indir=indir, grid_repr="global") - c.gather_nc_files() - c.process_avg_data(monthly_avg=False, batch_size = 14, apply_qa=True, geospatial_crop=[[-40, 60], [0, 70]], save=True) + mapies = TROPOMI(start_date, end_date, dest=outdir, indir=indir, grid_repr="global") + mapies.gather_nc_files() + mapies.process_avg_data(monthly_avg=False, batch_size = 14, apply_qa=True, geospatial_crop=[[-40, 60], [0, 70]], save=True) - c.plot_2D_observations(months=[0], outdir=outdir) - c.plot_2D_num_obs(months=[0], outdir=outdir) - #c.process_lazy_data(apply_qa=True, geospatial_crop=[[-40, 60], [0, 70]]) + mapies.plot_2D_observations(months=[0], outdir=outdir) + mapies.plot_2D_num_obs(months=[0], outdir=outdir) + mapies.process_lazy_data(apply_qa=True, geospatial_crop=[[-40, 60], [0, 70]]) end_time = time.time() elapsed_time = end_time - start_time print(f"Script executed in {elapsed_time:.2f} seconds.") -- GitLab From f8c58359fb348e178e7eade5aeba298dd7e447ba Mon Sep 17 00:00:00 2001 From: Calum Meikle Date: Thu, 24 Apr 2025 12:41:48 +0200 Subject: [PATCH 2/5] Change of name of yaml key --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 14432229..8a8287cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,3 @@ -pytest: +test: stage: test script: pytest mapies/tests/* \ No newline at end of file -- GitLab From 4e89f6820794930e6076c525f532ad9e32df9a44 Mon Sep 17 00:00:00 2001 From: Calum Meikle Date: Thu, 24 Apr 2025 12:51:58 +0200 Subject: [PATCH 3/5] Updating to try and change the runner --- .gitlab-ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8a8287cf..6510ed70 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,7 @@ -test: +pytests: stage: test - script: pytest mapies/tests/* \ No newline at end of file + script: + echo "Running tests" + pytest mapies/tests/* + tags: + - bscearth001 \ No newline at end of file -- GitLab From aac7f8206813df61b5d2c0365affb503fa92d65b Mon Sep 17 00:00:00 2001 From: Calum Meikle Date: Thu, 24 Apr 2025 14:28:50 +0200 Subject: [PATCH 4/5] Change runner --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6510ed70..afe0f700 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,4 +4,4 @@ pytests: echo "Running tests" pytest mapies/tests/* tags: - - bscearth001 \ No newline at end of file + - BDRC-runner \ No newline at end of file -- GitLab From d7904aec37dbd67eadbaf2f3a5e6686c6707daa5 Mon Sep 17 00:00:00 2001 From: Calum Meikle Date: Thu, 24 Apr 2025 14:29:49 +0200 Subject: [PATCH 5/5] Remove tags --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index afe0f700..643d9f11 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,5 +3,3 @@ pytests: script: echo "Running tests" pytest mapies/tests/* - tags: - - BDRC-runner \ No newline at end of file -- GitLab