Skip to content

Commit

Permalink
CI -> ci
Browse files Browse the repository at this point in the history
  • Loading branch information
remi-braun committed Dec 17, 2024
1 parent 54c5e9d commit c3b0dd2
Show file tree
Hide file tree
Showing 16 changed files with 31 additions and 31 deletions.
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ cov.xml
.run

# Discard CI/OUTPUTS
CI/**/*.tif
CI/**/*.npy
CI/**/*.vrt
ci/**/*.tif
ci/**/*.npy
ci/**/*.vrt

# Build options
build/
Expand All @@ -33,5 +33,5 @@ docs/api
dask-worker-space/*

# Other files
/CI/SCRIPTS/test.py
/ci/SCRIPTS/test.py
/notebooks_tests/
16 changes: 8 additions & 8 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/SCRIPTS --log-cli-level DEBUG
artifacts:
paths:
- ${CI_PROJECT_DIR}/cov_on_disk.html
Expand All @@ -46,7 +46,7 @@ pytest:
when: never
- changes:
- $EOREADER_CHANGES
- CI/**/*.{py,xml}
- ci/**/*.{py,xml}
- .gitlab-ci.yml
- pytest.ini
needs: [ "lint" ]
Expand All @@ -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/SCRIPTS --log-cli-level DEBUG --capture=tee-sys
artifacts:
paths:
- ${CI_PROJECT_DIR}/cov_s3.html
Expand All @@ -80,7 +80,7 @@ pytest_s3:
when: never
- changes:
- $EOREADER_CHANGES
- CI/**/*.{py,xml}
- ci/**/*.{py,xml}
- .gitlab-ci.yml
- pytest.ini
needs: [ "lint" ]
Expand All @@ -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/SCRIPTS_WEEKLY --log-cli-level DEBUG --capture=tee-sys
artifacts:
paths:
- ${CI_PROJECT_DIR}/cov_e2e.html
Expand All @@ -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/SCRIPTS --log-cli-level DEBUG --capture=tee-sys
# artifacts:
# paths:
# - ${CI_PROJECT_DIR}/cov_e2e.html
Expand Down Expand Up @@ -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/SCRIPTS --log-cli-level DEBUG --capture=tee-sys
# artifacts:
# paths:
# - ${CI_PROJECT_DIR}/cov_e2e.html
Expand Down Expand Up @@ -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/SCRIPTS --log-cli-level DEBUG --capture=tee-sys
# artifacts:
# paths:
# - ${CI_PROJECT_DIR}/cov_e2e.html
Expand Down
2 changes: 1 addition & 1 deletion CI/SCRIPTS/test_bands.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Script testing EOReader bands"""

from CI.scripts_utils import READER, opt_path, reduce_verbosity, s3_env
from ci.scripts_utils import READER, opt_path, reduce_verbosity, s3_env
from eoreader.bands import BLUE, YELLOW

reduce_verbosity()
Expand Down
2 changes: 1 addition & 1 deletion CI/SCRIPTS/test_custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from rasterio.windows import Window
from sertit import ci

from CI.scripts_utils import (
from ci.scripts_utils import (
READER,
dask_env,
get_db_dir,
Expand Down
2 changes: 1 addition & 1 deletion CI/SCRIPTS/test_end_to_end.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import xarray as xr
from sertit import AnyPath, path

from CI.scripts_utils import (
from ci.scripts_utils import (
CI_EOREADER_S3,
READER,
dask_env,
Expand Down
4 changes: 2 additions & 2 deletions CI/SCRIPTS/test_index.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import numpy as np
from sertit import ci, rasters

from CI.scripts_utils import (
from ci.scripts_utils import (
READER,
dask_env,
get_ci_data_dir,
Expand Down Expand Up @@ -34,7 +34,7 @@ def test_index(tmp_path):
)
prod = READER.open(s2_path, remove_tmp=True)
failed_idx = []
# tmp_path = "/home/data/CI/indices"
# tmp_path = "/home/data/ci/indices"
prod.output = os.path.join(tmp_path, prod.condensed_name)
idx_list = [BAI, NBR, NDVI]

Expand Down
2 changes: 1 addition & 1 deletion CI/SCRIPTS/test_others.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from rasterio.windows import Window
from sertit import AnyPath, path, unistra

from CI.scripts_utils import (
from ci.scripts_utils import (
READER,
dask_env,
get_db_dir,
Expand Down
2 changes: 1 addition & 1 deletion CI/SCRIPTS/test_satellites.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from matplotlib import pyplot as plt
from sertit import AnyPath, ci, misc, path

from CI.scripts_utils import (
from ci.scripts_utils import (
CI_EOREADER_S3,
READER,
dask_env,
Expand Down
2 changes: 1 addition & 1 deletion CI/SCRIPTS/test_stac_items.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from sertit import s3
from tempenv import tempenv

from CI.scripts_utils import READER, compare, reduce_verbosity
from ci.scripts_utils import READER, compare, reduce_verbosity
from eoreader import EOREADER_NAME
from eoreader.products import Product
from eoreader.reader import Constellation
Expand Down
4 changes: 2 additions & 2 deletions CI/SCRIPTS_WEEKLY/test_all_sat_end_to_end_on_disk.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from lxml import etree
from sertit import AnyPath, path, types

from CI.scripts_utils import (
from ci.scripts_utils import (
CI_EOREADER_S3,
READER,
dask_env,
Expand Down Expand Up @@ -200,7 +200,7 @@ def _test_core(

with tempfile.TemporaryDirectory() as tmp_dir:
if WRITE_ON_DISK:
tmp_dir = os.path.join("/home/data/CI/e2e_satellites")
tmp_dir = os.path.join("/home/data/ci/e2e_satellites")
output = tmp_dir
is_zip = "_ZIP" if prod.is_archived else ""
prod.output = os.path.join(output, f"{prod.condensed_name}{is_zip}")
Expand Down
2 changes: 1 addition & 1 deletion CI/SCRIPTS_WEEKLY/test_broken_s2.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import pytest

from CI.scripts_utils import READER, broken_s2_path, dask_env, reduce_verbosity, s3_env
from ci.scripts_utils import READER, broken_s2_path, dask_env, reduce_verbosity, s3_env
from eoreader import EOREADER_NAME
from eoreader.bands import NIR, RED
from eoreader.exceptions import InvalidProductError
Expand Down
4 changes: 2 additions & 2 deletions CI/SCRIPTS_WEEKLY/test_custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import pytest
from sertit import ci

from CI.SCRIPTS.test_custom import test_custom_invalid, test_custom_optical
from CI.scripts_utils import READER, dask_env, others_path, reduce_verbosity, s3_env
from ci.SCRIPTS.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 (
BLUE,
Expand Down
2 changes: 1 addition & 1 deletion CI/SCRIPTS_WEEKLY/test_index.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import numpy as np
from sertit import ci, rasters

from CI.scripts_utils import (
from ci.scripts_utils import (
READER,
dask_env,
get_ci_data_dir,
Expand Down
6 changes: 3 additions & 3 deletions CI/SCRIPTS_WEEKLY/test_satellites.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
from rasterio.windows import Window
from sertit import ci, path, rasters

from CI.SCRIPTS import test_satellites
from CI.scripts_utils import (
from ci.SCRIPTS import test_satellites
from ci.scripts_utils import (
CI_EOREADER_S3,
READER,
dask_env,
Expand Down Expand Up @@ -307,7 +307,7 @@ def _test_core(

with tempfile.TemporaryDirectory() as tmp_dir:
if WRITE_ON_DISK:
tmp_dir = os.path.join("/home/data/CI/satellites")
tmp_dir = os.path.join("/home/data/ci/satellites")
prod.output = tmp_dir

# DO NOT REPROJECT BANDS (WITH GDAL / SNAP) --> WAY TOO SLOW
Expand Down
2 changes: 1 addition & 1 deletion CI/SCRIPTS_WEEKLY/test_stac_creation.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from sertit.vectors import WGS84
from shapely.geometry import mapping

from CI.scripts_utils import (
from ci.scripts_utils import (
CI_EOREADER_S3,
READER,
compare,
Expand Down
2 changes: 1 addition & 1 deletion CI/SCRIPTS_WEEKLY/test_stac_items.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from sertit import s3
from tempenv import tempenv

from CI.scripts_utils import READER, compare, reduce_verbosity
from ci.scripts_utils import READER, compare, reduce_verbosity
from eoreader import EOREADER_NAME
from eoreader.products import Product
from eoreader.reader import Constellation
Expand Down

0 comments on commit c3b0dd2

Please sign in to comment.