Skip to content

Commit 415f1d0

Browse files
alinbutualinbutu
committed
Merge remote-tracking branch 'origin/develop' into fix/rspy448-staging-jobs-wrong-id-handling
2 parents 8bca305 + 937a9b9 commit 415f1d0

24 files changed

+1261
-1194
lines changed

‎docs/poetry.lock‎

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎poetry.lock‎

Lines changed: 209 additions & 207 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pyproject.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ optional = true
6565
pytest = "^8.3.3"
6666
pytest-asyncio = "^0.25.3"
6767
pytest-cov = "^6.0.0"
68-
pytest-docker = "^3.1.0"
68+
pytest-docker = "^3.1.2"
6969
pytest-error-for-skips = "^2.0.2"
7070
pytest-httpx = "^0.34.0"
7171
pytest-mock = "^3.14.0"
7272
black = "^25.1.0"
73-
mypy = "^1.14.1"
73+
mypy = "^1.15.0"
7474
pre-commit = "^4.1.0"
7575
types-requests = "^2.32.0.20241016"
7676
flake8 = "^7.1.1"
@@ -79,7 +79,7 @@ safety = "^3.2.14"
7979
pylint = "^3.3.0"
8080
flake8-pyproject = "^1.2.3"
8181
httpx = "^0.27.2"
82-
moto = "==5.0.27"
82+
moto = "==5.0.28"
8383
flask = "^3.0.3"
8484
flask-cors = "^5.0.0"
8585
sphinx = "^8.1.3"

‎services/adgs/config/adgs_ws_config.template.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ template:
102102
operations:
103103
and:
104104
- "contains(Name, '{Name}')"
105-
- "PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}"
106-
- "PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}"
105+
- "(PublicationDate gt {StartPublicationDate#to_iso_utc_datetime} or PublicationDate eq {StartPublicationDate#to_iso_utc_datetime})"
106+
- "(PublicationDate lt {StopPublicationDate#to_iso_utc_datetime} or PublicationDate eq {StopPublicationDate#to_iso_utc_datetime})"
107107
- "PublicationDate eq {PublicationDate#to_iso_utc_datetime}"
108108
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'productType' and att/OData.CSC.StringAttribute/Value eq '{attr_ptype}')"
109109
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformSerialIdentifier' and att/OData.CSC.StringAttribute/Value eq '{attr_serial_identif}')"

‎services/adgs/config/adgs_ws_config.yaml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,10 @@ adgs:
107107
operations:
108108
and:
109109
- contains(Name, '{Name}')
110-
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
111-
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
110+
- (PublicationDate gt {StartPublicationDate#to_iso_utc_datetime} or PublicationDate
111+
eq {StartPublicationDate#to_iso_utc_datetime})
112+
- (PublicationDate lt {StopPublicationDate#to_iso_utc_datetime} or PublicationDate
113+
eq {StopPublicationDate#to_iso_utc_datetime})
112114
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
113115
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'productType'
114116
and att/OData.CSC.StringAttribute/Value eq '{attr_ptype}')
@@ -233,8 +235,10 @@ adgs2:
233235
operations:
234236
and:
235237
- contains(Name, '{Name}')
236-
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
237-
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
238+
- (PublicationDate gt {StartPublicationDate#to_iso_utc_datetime} or PublicationDate
239+
eq {StartPublicationDate#to_iso_utc_datetime})
240+
- (PublicationDate lt {StopPublicationDate#to_iso_utc_datetime} or PublicationDate
241+
eq {StopPublicationDate#to_iso_utc_datetime})
238242
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
239243
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'productType'
240244
and att/OData.CSC.StringAttribute/Value eq '{attr_ptype}')

‎services/adgs/config/adgs_ws_config_token_module.template.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ template:
8989
operations:
9090
and:
9191
- "contains(Name, '{Name}')"
92-
- "PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}"
93-
- "PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}"
92+
- "(PublicationDate gt {StartPublicationDate#to_iso_utc_datetime} or PublicationDate eq {StartPublicationDate#to_iso_utc_datetime})"
93+
- "(PublicationDate lt {StopPublicationDate#to_iso_utc_datetime} or PublicationDate eq {StopPublicationDate#to_iso_utc_datetime})"
9494
- "PublicationDate eq {PublicationDate#to_iso_utc_datetime}"
9595
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'productType' and att/OData.CSC.StringAttribute/Value eq '{attr_ptype}')"
9696
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformSerialIdentifier' and att/OData.CSC.StringAttribute/Value eq '{attr_serial_identif}')"

‎services/adgs/config/adgs_ws_config_token_module.yaml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,10 @@ adgs:
9494
operations:
9595
and:
9696
- contains(Name, '{Name}')
97-
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
98-
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
97+
- (PublicationDate gt {StartPublicationDate#to_iso_utc_datetime} or PublicationDate
98+
eq {StartPublicationDate#to_iso_utc_datetime})
99+
- (PublicationDate lt {StopPublicationDate#to_iso_utc_datetime} or PublicationDate
100+
eq {StopPublicationDate#to_iso_utc_datetime})
99101
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
100102
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'productType'
101103
and att/OData.CSC.StringAttribute/Value eq '{attr_ptype}')
@@ -207,8 +209,10 @@ adgs2:
207209
operations:
208210
and:
209211
- contains(Name, '{Name}')
210-
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
211-
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
212+
- (PublicationDate gt {StartPublicationDate#to_iso_utc_datetime} or PublicationDate
213+
eq {StartPublicationDate#to_iso_utc_datetime})
214+
- (PublicationDate lt {StopPublicationDate#to_iso_utc_datetime} or PublicationDate
215+
eq {StopPublicationDate#to_iso_utc_datetime})
212216
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
213217
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'productType'
214218
and att/OData.CSC.StringAttribute/Value eq '{attr_ptype}')

0 commit comments

Comments
 (0)