Skip to content

Commit

Permalink
Fixing CI
Browse files Browse the repository at this point in the history
  • Loading branch information
remi-braun committed Jan 10, 2025
1 parent be6628b commit d8e2f73
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ ci/**/*.npy
ci/**/*.vrt
ci/**/*.geojson
ci/**/*.xml
ci/**/*.jp2

# Build options
build/
Expand Down
2 changes: 1 addition & 1 deletion ci/on_push/test_end_to_end.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ def _test_core(
LOGGER.info("Checking opening solutions")
LOGGER.info("MTD")
prod: Product = READER.open(
pattern_path, method=CheckMethod.MTD, remove_tmp=debug
pattern_path, method=CheckMethod.MTD, remove_tmp=not debug
)

# Log name
Expand Down
2 changes: 1 addition & 1 deletion ci/on_push/test_satellites.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ def check_prod(pattern_path: str, debug: bool = WRITE_ON_DISK) -> Product:
pattern_path,
method=CheckMethod.MTD,
constellation=prod_name.constellation,
remove_tmp=debug,
remove_tmp=not debug,
)
assert prod is not None

Expand Down
10 changes: 7 additions & 3 deletions ci/weekly/test_satellites.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"""Script testing EOReader satellites weekly"""

import contextlib
import logging
import os
import sys
Expand Down Expand Up @@ -51,7 +52,7 @@
LOGGER = logging.getLogger(EOREADER_NAME)

MERIT_DEM_SUB_DIR_PATH = test_satellites.MERIT_DEM_SUB_DIR_PATH
WRITE_ON_DISK = False
WRITE_ON_DISK = True

reduce_verbosity()

Expand Down Expand Up @@ -319,7 +320,9 @@ def core(prod_path, possible_bands, debug, **kwargs):
client.scheduler.shutdown()
client.retire_workers()
client.close()
client.shutdown()

with contextlib.suppress(RuntimeError):
client.shutdown()

# Check products
prod = test_satellites.check_prod(prod_path, debug)
Expand Down Expand Up @@ -376,7 +379,8 @@ def core(prod_path, possible_bands, debug, **kwargs):
if not WRITE_ON_DISK:
test_satellites.check_clean(prod)

prod.clear()
if not WRITE_ON_DISK:
prod.clear()


@s3_env
Expand Down

0 comments on commit d8e2f73

Please sign in to comment.