From 108b72d247ccf7cc76ec98ed3823363fb7cafc02 Mon Sep 17 00:00:00 2001 From: BRAUN REMI Date: Tue, 17 Dec 2024 09:52:17 +0100 Subject: [PATCH] SCRIPTS -> on-push / SCRIPTS_WEEKLY -> weekly --- .gitignore | 2 +- .gitlab-ci.yml | 12 ++++++------ CI/{SCRIPTS => on_push}/__init__.py | 0 CI/{SCRIPTS => on_push}/test_bands.py | 0 CI/{SCRIPTS => on_push}/test_custom.py | 0 CI/{SCRIPTS => on_push}/test_end_to_end.py | 0 CI/{SCRIPTS => on_push}/test_index.py | 0 CI/{SCRIPTS => on_push}/test_others.py | 0 CI/{SCRIPTS => on_push}/test_satellites.py | 0 CI/{SCRIPTS => on_push}/test_stac_items.py | 0 CI/scripts_utils.py | 2 +- CI/{SCRIPTS_WEEKLY => weekly}/__init__.py | 0 .../test_all_sat_end_to_end_on_disk.py | 0 CI/{SCRIPTS_WEEKLY => weekly}/test_broken_s2.py | 0 CI/{SCRIPTS_WEEKLY => weekly}/test_custom.py | 2 +- CI/{SCRIPTS_WEEKLY => weekly}/test_index.py | 0 CI/{SCRIPTS_WEEKLY => weekly}/test_satellites.py | 2 +- CI/{SCRIPTS_WEEKLY => weekly}/test_stac_creation.py | 0 CI/{SCRIPTS_WEEKLY => weekly}/test_stac_items.py | 0 19 files changed, 10 insertions(+), 10 deletions(-) rename CI/{SCRIPTS => on_push}/__init__.py (100%) rename CI/{SCRIPTS => on_push}/test_bands.py (100%) rename CI/{SCRIPTS => on_push}/test_custom.py (100%) rename CI/{SCRIPTS => on_push}/test_end_to_end.py (100%) rename CI/{SCRIPTS => on_push}/test_index.py (100%) rename CI/{SCRIPTS => on_push}/test_others.py (100%) rename CI/{SCRIPTS => on_push}/test_satellites.py (100%) rename CI/{SCRIPTS => on_push}/test_stac_items.py (100%) rename CI/{SCRIPTS_WEEKLY => weekly}/__init__.py (100%) rename CI/{SCRIPTS_WEEKLY => weekly}/test_all_sat_end_to_end_on_disk.py (100%) rename CI/{SCRIPTS_WEEKLY => weekly}/test_broken_s2.py (100%) rename CI/{SCRIPTS_WEEKLY => weekly}/test_custom.py (98%) rename CI/{SCRIPTS_WEEKLY => weekly}/test_index.py (100%) rename CI/{SCRIPTS_WEEKLY => weekly}/test_satellites.py (99%) rename CI/{SCRIPTS_WEEKLY => weekly}/test_stac_creation.py (100%) rename CI/{SCRIPTS_WEEKLY => weekly}/test_stac_items.py (100%) diff --git a/.gitignore b/.gitignore index 42a2f8ac..3d734d13 100644 --- a/.gitignore +++ b/.gitignore @@ -33,5 +33,5 @@ docs/api dask-worker-space/* # Other files -/ci/SCRIPTS/test.py +/ci/on_push/test.py /notebooks_tests/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f72faeff..1b760620 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,7 +30,7 @@ pytest: - pip install --ignore-installed PyYAML - pip install -e . script: - - python -m pytest -v --durations=0 --cov-report term --cov-report html:${CI_PROJECT_DIR}/cov_on_disk.html --cov=eoreader --cov-config=.coveragerc ci/SCRIPTS --log-cli-level DEBUG + - python -m pytest -v --durations=0 --cov-report term --cov-report html:${CI_PROJECT_DIR}/cov_on_disk.html --cov=eoreader --cov-config=.coveragerc ci/on_push --log-cli-level DEBUG artifacts: paths: - ${CI_PROJECT_DIR}/cov_on_disk.html @@ -64,7 +64,7 @@ pytest_s3: - pip install --ignore-installed PyYAML - pip install -e . script: - - python -m pytest -v --durations=0 --cov-report term --cov-report html:${CI_PROJECT_DIR}/cov_s3.html --cov=eoreader --cov-config=.coveragerc ci/SCRIPTS --log-cli-level DEBUG --capture=tee-sys + - python -m pytest -v --durations=0 --cov-report term --cov-report html:${CI_PROJECT_DIR}/cov_s3.html --cov=eoreader --cov-config=.coveragerc ci/on_push --log-cli-level DEBUG --capture=tee-sys artifacts: paths: - ${CI_PROJECT_DIR}/cov_s3.html @@ -96,7 +96,7 @@ pytest_end_to_end: - pip install --ignore-installed PyYAML - pip install -e . script: - - python -m pytest -v --durations=0 --cov-report term --cov-report html:${CI_PROJECT_DIR}/cov_e2e.html --cov=eoreader --cov-config=.coveragerc ci/SCRIPTS_WEEKLY --log-cli-level DEBUG --capture=tee-sys + - python -m pytest -v --durations=0 --cov-report term --cov-report html:${CI_PROJECT_DIR}/cov_e2e.html --cov=eoreader --cov-config=.coveragerc ci/weekly --log-cli-level DEBUG --capture=tee-sys artifacts: paths: - ${CI_PROJECT_DIR}/cov_e2e.html @@ -123,7 +123,7 @@ pytest_end_to_end: # - pip install pytest coverage pytest-cov pylint # - pip install -e . # script: -# - python -m pytest -v --durations=0 --cov-report term --cov-report html:${CI_PROJECT_DIR}/cov_e2e.html --cov=eoreader --cov-config=.coveragerc ci/SCRIPTS --log-cli-level DEBUG --capture=tee-sys +# - python -m pytest -v --durations=0 --cov-report term --cov-report html:${CI_PROJECT_DIR}/cov_e2e.html --cov=eoreader --cov-config=.coveragerc ci/on_push --log-cli-level DEBUG --capture=tee-sys # artifacts: # paths: # - ${CI_PROJECT_DIR}/cov_e2e.html @@ -151,7 +151,7 @@ pytest_end_to_end: # - pip install pytest coverage pytest-cov pylint # - pip install -e . # script: -# - python -m pytest -v --durations=0 --cov-report term --cov-report html:${CI_PROJECT_DIR}/cov.html --cov=eoreader --cov-config=.coveragerc ci/SCRIPTS --log-cli-level DEBUG --capture=tee-sys +# - python -m pytest -v --durations=0 --cov-report term --cov-report html:${CI_PROJECT_DIR}/cov.html --cov=eoreader --cov-config=.coveragerc ci/on_push --log-cli-level DEBUG --capture=tee-sys # artifacts: # paths: # - ${CI_PROJECT_DIR}/cov_e2e.html @@ -179,7 +179,7 @@ pytest_end_to_end: # - pip install pytest coverage pytest-cov pylint # - pip install -e . # script: -# - python -m pytest -v --durations=0 --cov-report term --cov-report html:${CI_PROJECT_DIR}/cov_e2e.html --cov=eoreader --cov-config=.coveragerc ci/SCRIPTS --log-cli-level DEBUG --capture=tee-sys +# - python -m pytest -v --durations=0 --cov-report term --cov-report html:${CI_PROJECT_DIR}/cov_e2e.html --cov=eoreader --cov-config=.coveragerc ci/on_push --log-cli-level DEBUG --capture=tee-sys # artifacts: # paths: # - ${CI_PROJECT_DIR}/cov_e2e.html diff --git a/CI/SCRIPTS/__init__.py b/CI/on_push/__init__.py similarity index 100% rename from CI/SCRIPTS/__init__.py rename to CI/on_push/__init__.py diff --git a/CI/SCRIPTS/test_bands.py b/CI/on_push/test_bands.py similarity index 100% rename from CI/SCRIPTS/test_bands.py rename to CI/on_push/test_bands.py diff --git a/CI/SCRIPTS/test_custom.py b/CI/on_push/test_custom.py similarity index 100% rename from CI/SCRIPTS/test_custom.py rename to CI/on_push/test_custom.py diff --git a/CI/SCRIPTS/test_end_to_end.py b/CI/on_push/test_end_to_end.py similarity index 100% rename from CI/SCRIPTS/test_end_to_end.py rename to CI/on_push/test_end_to_end.py diff --git a/CI/SCRIPTS/test_index.py b/CI/on_push/test_index.py similarity index 100% rename from CI/SCRIPTS/test_index.py rename to CI/on_push/test_index.py diff --git a/CI/SCRIPTS/test_others.py b/CI/on_push/test_others.py similarity index 100% rename from CI/SCRIPTS/test_others.py rename to CI/on_push/test_others.py diff --git a/CI/SCRIPTS/test_satellites.py b/CI/on_push/test_satellites.py similarity index 100% rename from CI/SCRIPTS/test_satellites.py rename to CI/on_push/test_satellites.py diff --git a/CI/SCRIPTS/test_stac_items.py b/CI/on_push/test_stac_items.py similarity index 100% rename from CI/SCRIPTS/test_stac_items.py rename to CI/on_push/test_stac_items.py diff --git a/CI/scripts_utils.py b/CI/scripts_utils.py index 7fd9749e..f926e40a 100644 --- a/CI/scripts_utils.py +++ b/CI/scripts_utils.py @@ -1,4 +1,4 @@ -"""Utils module for scripts""" +"""Utils module for on_push""" import logging import os diff --git a/CI/SCRIPTS_WEEKLY/__init__.py b/CI/weekly/__init__.py similarity index 100% rename from CI/SCRIPTS_WEEKLY/__init__.py rename to CI/weekly/__init__.py diff --git a/CI/SCRIPTS_WEEKLY/test_all_sat_end_to_end_on_disk.py b/CI/weekly/test_all_sat_end_to_end_on_disk.py similarity index 100% rename from CI/SCRIPTS_WEEKLY/test_all_sat_end_to_end_on_disk.py rename to CI/weekly/test_all_sat_end_to_end_on_disk.py diff --git a/CI/SCRIPTS_WEEKLY/test_broken_s2.py b/CI/weekly/test_broken_s2.py similarity index 100% rename from CI/SCRIPTS_WEEKLY/test_broken_s2.py rename to CI/weekly/test_broken_s2.py diff --git a/CI/SCRIPTS_WEEKLY/test_custom.py b/CI/weekly/test_custom.py similarity index 98% rename from CI/SCRIPTS_WEEKLY/test_custom.py rename to CI/weekly/test_custom.py index 5a0ac348..c08d1bbf 100644 --- a/CI/SCRIPTS_WEEKLY/test_custom.py +++ b/CI/weekly/test_custom.py @@ -6,7 +6,7 @@ import pytest from sertit import ci -from ci.SCRIPTS.test_custom import test_custom_invalid, test_custom_optical +from ci.on_push.test_custom import test_custom_invalid, test_custom_optical from ci.scripts_utils import READER, dask_env, others_path, reduce_verbosity, s3_env from eoreader import EOREADER_NAME from eoreader.bands import ( diff --git a/CI/SCRIPTS_WEEKLY/test_index.py b/CI/weekly/test_index.py similarity index 100% rename from CI/SCRIPTS_WEEKLY/test_index.py rename to CI/weekly/test_index.py diff --git a/CI/SCRIPTS_WEEKLY/test_satellites.py b/CI/weekly/test_satellites.py similarity index 99% rename from CI/SCRIPTS_WEEKLY/test_satellites.py rename to CI/weekly/test_satellites.py index d142e891..99f4080f 100644 --- a/CI/SCRIPTS_WEEKLY/test_satellites.py +++ b/CI/weekly/test_satellites.py @@ -12,7 +12,7 @@ from rasterio.windows import Window from sertit import ci, path, rasters -from ci.SCRIPTS import test_satellites +from ci.on_push import test_satellites from ci.scripts_utils import ( CI_EOREADER_S3, READER, diff --git a/CI/SCRIPTS_WEEKLY/test_stac_creation.py b/CI/weekly/test_stac_creation.py similarity index 100% rename from CI/SCRIPTS_WEEKLY/test_stac_creation.py rename to CI/weekly/test_stac_creation.py diff --git a/CI/SCRIPTS_WEEKLY/test_stac_items.py b/CI/weekly/test_stac_items.py similarity index 100% rename from CI/SCRIPTS_WEEKLY/test_stac_items.py rename to CI/weekly/test_stac_items.py