Skip to content

Commit dd3d63e

Browse files
mmacatammacata
committed
Merge branch 'main' of github.com:actinia-org/actinia-core into super-linter
2 parents ee18a1a + 0b4c064 commit dd3d63e

File tree

9 files changed

+55
-50
lines changed

9 files changed

+55
-50
lines changed

‎.github/workflows/linting.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Python Flake8, black and pylint code quality check
22

3-
on: [push]
3+
on: [push, pull_request]
44

55
jobs:
66
lint:

‎CHANGELOG.md

+18-14
Original file line numberDiff line numberDiff line change
@@ -23,32 +23,36 @@ https://github.com/actinia-org/actinia-core/compare/4.3.1...main
2323
released from main
2424
...
2525

26-
## [4.14.0] - 2024-05-24
26+
## \[4.14.0\] - 2024-05-24
27+
2728
released from main
2829

2930
### Changed
30-
* update different dependencies by @anikaweinmann in https://github.com/actinia-org/actinia-core/pull/514
31-
* chore(deps): update mundialis/actinia-core docker tag to v4.13.1 by @renovate in https://github.com/actinia-org/actinia-core/pull/503
32-
* chore(deps): update softprops/action-gh-release action to v2 by @renovate in https://github.com/actinia-org/actinia-core/pull/504
33-
* chore(deps): update actions/checkout digest to 1d96c77 by @renovate in https://github.com/actinia-org/actinia-core/pull/510
34-
* chore(deps): update dependency google-cloud-bigquery to v3 by @renovate in https://github.com/actinia-org/actinia-core/pull/435
35-
* chore(deps): update dependency pystac to v1 by @renovate in https://github.com/actinia-org/actinia-core/pull/436
36-
* chore(deps): update actions/checkout digest to a5ac7e5 by @renovate in https://github.com/actinia-org/actinia-core/pull/515
37-
* chore(deps): update anchore/sbom-action digest to 07e5b3a by @renovate in https://github.com/actinia-org/actinia-core/pull/516
31+
32+
- update different dependencies by @anikaweinmann in https://github.com/actinia-org/actinia-core/pull/514
33+
- chore(deps): update mundialis/actinia-core docker tag to v4.13.1 by @renovate in https://github.com/actinia-org/actinia-core/pull/503
34+
- chore(deps): update softprops/action-gh-release action to v2 by @renovate in https://github.com/actinia-org/actinia-core/pull/504
35+
- chore(deps): update actions/checkout digest to 1d96c77 by @renovate in https://github.com/actinia-org/actinia-core/pull/510
36+
- chore(deps): update dependency google-cloud-bigquery to v3 by @renovate in https://github.com/actinia-org/actinia-core/pull/435
37+
- chore(deps): update dependency pystac to v1 by @renovate in https://github.com/actinia-org/actinia-core/pull/436
38+
- chore(deps): update actions/checkout digest to a5ac7e5 by @renovate in https://github.com/actinia-org/actinia-core/pull/515
39+
- chore(deps): update anchore/sbom-action digest to 07e5b3a by @renovate in https://github.com/actinia-org/actinia-core/pull/516
3840

3941
### Removed
40-
* Remove python dependency by @mmacata in https://github.com/actinia-org/actinia-core/pull/506
42+
43+
- Remove python dependency by @mmacata in https://github.com/actinia-org/actinia-core/pull/506
4144

4245
### Fixed
43-
* README: fix minor grammar issues by @pesekon2 in https://github.com/actinia-org/actinia-core/pull/513
46+
47+
- README: fix minor grammar issues by @pesekon2 in https://github.com/actinia-org/actinia-core/pull/513
4448

4549
### New Contributors
46-
* @pesekon2 made their first contribution in https://github.com/actinia-org/actinia-core/pull/513
4750

48-
**Full Changelog**: https://github.com/actinia-org/actinia-core/compare/4.13.1...4.14.0
51+
- @pesekon2 made their first contribution in https://github.com/actinia-org/actinia-core/pull/513
4952

50-
"generated with `gh api repos/actinia-org/actinia-core/releases/generate-notes -f tag_name="4.14.0" -f target_commitish=main -q .body`"
53+
**Full Changelog**: https://github.com/actinia-org/actinia-core/compare/4.13.1...4.14.0
5154

55+
"generated with `gh api repos/actinia-org/actinia-core/releases/generate-notes -f tag_name="4.14.0" -f target_commitish=main -q .body`"
5256

5357
## [4.13.1](https://github.com/actinia-org/actinia-core/releases/tag/4.13.1) - 2024-02-23
5458

‎src/actinia_core/__init__.py

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#######
2323

2424
import importlib.metadata
25+
2526
try:
2627
# Change here if project is renamed and does not equal the package name
2728
dist_name = __name__

‎src/actinia_core/core/common/aws_sentinel_interface.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -305,9 +305,9 @@ def _parse_scene_info(self, bands, product_id, info):
305305
preview_url = (
306306
f'{self.aws_sentinel_base_url}/{tile["path"]}/preview.jpg'
307307
)
308-
tile_info[
309-
"url"
310-
] = f'{self.aws_sentinel_base_eu_central_url}/#{tile["path"]}/'
308+
tile_info["url"] = (
309+
f'{self.aws_sentinel_base_eu_central_url}/#{tile["path"]}/'
310+
)
311311

312312
tile_info["metadata"] = metadata_url
313313
tile_info["info"] = info_url

‎src/actinia_core/core/common/google_satellite_bigquery_interface.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,9 @@ def __init__(self, config):
211211
self.gcs_url = "https://storage.googleapis.com/"
212212
self.sentinel_xml_metadata_file = "MTD_MSIL1C.xml"
213213
self.config = config
214-
os.environ[
215-
"GOOGLE_APPLICATION_CREDENTIALS"
216-
] = self.config.GOOGLE_APPLICATION_CREDENTIALS
214+
os.environ["GOOGLE_APPLICATION_CREDENTIALS"] = (
215+
self.config.GOOGLE_APPLICATION_CREDENTIALS
216+
)
217217
os.environ["GOOGLE_CLOUD_PROJECT"] = self.config.GOOGLE_CLOUD_PROJECT
218218

219219
self.sentinel_bands = [

‎src/actinia_core/core/common/process_chain.py

+21-21
Original file line numberDiff line numberDiff line change
@@ -378,9 +378,9 @@ def _get_sentinel_import_commands(self, entries):
378378
for scene in scenes_bands:
379379
scene_id = scene["scene_id"]
380380
download_cache = f"download_cache_{scene_id}"
381-
self.temporary_pc_files[
382-
download_cache
383-
] = self.generate_temp_file_path()
381+
self.temporary_pc_files[download_cache] = (
382+
self.generate_temp_file_path()
383+
)
384384
sp = Sentinel2Processing(
385385
bands=scene["bands"],
386386
download_cache=self.temporary_pc_files[download_cache],
@@ -835,9 +835,9 @@ def _create_exec_process(self, module_descr):
835835
file_id = search_string.split("::")[1]
836836
# Generate the temporary file path and store it in the dict
837837
if file_id not in self.temporary_pc_files:
838-
self.temporary_pc_files[
839-
file_id
840-
] = self.generate_temp_file_path()
838+
self.temporary_pc_files[file_id] = (
839+
self.generate_temp_file_path()
840+
)
841841

842842
param = "%s" % self.temporary_pc_files[file_id]
843843
else:
@@ -997,9 +997,9 @@ def _create_module_process_legacy(self, id, module_descr):
997997
file_id = search_string.split("::")[1]
998998
# Generate the temporary file path and store it in the dict
999999
if file_id not in self.temporary_pc_files:
1000-
self.temporary_pc_files[
1001-
file_id
1002-
] = self.generate_temp_file_path()
1000+
self.temporary_pc_files[file_id] = (
1001+
self.generate_temp_file_path()
1002+
)
10031003

10041004
param = "%s=%s" % (key, self.temporary_pc_files[file_id])
10051005
else:
@@ -1063,9 +1063,9 @@ def _create_module_process_legacy(self, id, module_descr):
10631063
# Generate the temporary file path and store it in the
10641064
# dict
10651065
if file_id not in self.temporary_pc_files:
1066-
self.temporary_pc_files[
1067-
file_id
1068-
] = self.generate_temp_file_path()
1066+
self.temporary_pc_files[file_id] = (
1067+
self.generate_temp_file_path()
1068+
)
10691069

10701070
param = "%s=%s" % (
10711071
key,
@@ -1191,9 +1191,9 @@ def _create_exec_process_legacy(self, id, module_descr):
11911191
file_id = search_string.split("::")[1]
11921192
# Generate the temporary file path and store it in the dict
11931193
if file_id not in self.temporary_pc_files:
1194-
self.temporary_pc_files[
1195-
file_id
1196-
] = self.generate_temp_file_path()
1194+
self.temporary_pc_files[file_id] = (
1195+
self.generate_temp_file_path()
1196+
)
11971197

11981198
param = "%s" % self.temporary_pc_files[file_id]
11991199
else:
@@ -1264,9 +1264,9 @@ def _add_grass_module_input_parameter_to_list(
12641264
file_id = value.split("::")[1]
12651265
# Generate the temporary file path and store it in the dict
12661266
if file_id not in self.temporary_pc_files:
1267-
self.temporary_pc_files[
1268-
file_id
1269-
] = self.generate_temp_file_path()
1267+
self.temporary_pc_files[file_id] = (
1268+
self.generate_temp_file_path()
1269+
)
12701270
param = "%s=%s" % (param, self.temporary_pc_files[file_id])
12711271
elif "::" in value and value.split("::")[1] in [
12721272
"stdout",
@@ -1396,9 +1396,9 @@ def _add_grass_module_output_parameter_to_list(
13961396
file_id = value.split("::")[1]
13971397
# Generate the temporary file path and store it in the dict
13981398
if file_id not in self.temporary_pc_files:
1399-
self.temporary_pc_files[
1400-
file_id
1401-
] = self.generate_temp_file_path()
1399+
self.temporary_pc_files[file_id] = (
1400+
self.generate_temp_file_path()
1401+
)
14021402
# Store the file path in the output description for export
14031403
param = "%s=%s" % (param, self.temporary_pc_files[file_id])
14041404
# Add the temp file path and the new file name with suffix to ,

‎src/actinia_core/core/interim_results.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ def _compare_sha512sums_of_folders(self, folder1, folder2):
186186
# get sha512sum of the folder
187187
cur_working_dir = os.getcwd()
188188
sha512sum_cmd = (
189-
r"find . -type f -exec sha512sum {} \; | " + "sort -k 2 | sha512sum"
189+
r"find . -type f -exec sha512sum {} \; |" + "sort -k 2 | sha512sum"
190190
)
191191
sha512sums = list()
192192
for folder in [folder1, folder2]:

‎src/actinia_core/core/storage_interface_gcs.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ def setup(self):
6363
"""
6464
Setup the Google Cloud Storage (GCS) client and the GCS credentials
6565
"""
66-
os.environ[
67-
"GOOGLE_APPLICATION_CREDENTIALS"
68-
] = self.config.GOOGLE_APPLICATION_CREDENTIALS
66+
os.environ["GOOGLE_APPLICATION_CREDENTIALS"] = (
67+
self.config.GOOGLE_APPLICATION_CREDENTIALS
68+
)
6969
self.storage_client = storage.Client()
7070

7171
def get_resource_urls(self):

‎src/actinia_core/processing/actinia_processing/ephemeral_processing.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1718,10 +1718,10 @@ def _run_executable(self, process, poll_time=0.005):
17181718
for x in par_val.split()
17191719
}[filter]
17201720
filtered_func_name += f"::{filter}"
1721-
process.executable_params[
1722-
i
1723-
] = process.executable_params[i].replace(
1724-
filtered_func_name, filtered_par_value
1721+
process.executable_params[i] = (
1722+
process.executable_params[i].replace(
1723+
filtered_func_name, filtered_par_value
1724+
)
17251725
)
17261726

17271727
if process.stdin_source is not None:

0 commit comments

Comments
 (0)