Skip to content

Commit de7c453

Browse files
author
Alex Grosu
committed
Merge remote-tracking branch 'origin/develop' into feat-rspy582/remove-deprecated-code
2 parents f2dc592 + 970108e commit de7c453

20 files changed

+663
-590
lines changed

‎.github/workflows/publish-binaries.yml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ jobs:
493493
- uses: actions/checkout@v4
494494

495495
# Download .whl files into a local dir
496-
# TODO: the following 5 comments have to be activated when the pydantic conflict is solved
496+
# TODO: the next 5 commented lines must be reactivated when the pydantic conflict is solved
497497
#- name: Download .whl dependencies
498498
# uses: actions/download-artifact@v4
499499
# with:
@@ -547,12 +547,8 @@ jobs:
547547
run: |
548548
set -x
549549
550-
# Clone the rs-demo repository.
551-
# Use the ssh public key from: https://github.com/RS-PYTHON/rs-demo/settings/keys
552-
# and the private key from: https://github.com/RS-PYTHON/rs-server/settings/secrets/actions
553-
eval "$(ssh-agent -s)"
554-
ssh-add - <<< "${{ secrets.RS_DEMO_PRIVATE_SSH_KEY }}"
555-
git clone [email protected]:RS-PYTHON/rs-demo.git
550+
# Clone the rs-demo repository
551+
git clone https://github.com/RS-PYTHON/rs-demo.git
556552
557553
# Try to checkout in rs-demo the same branch name than in rs-server.
558554
# If the branch doesn't exist, it's ok, we stay on the default branch.

‎poetry.lock‎

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

‎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)