Skip to content

Commit 14d28f5

Browse files
PadeanuPadeanu
committed
Merge branch 'develop' into feat-rspy493/extend-filter-attributes
2 parents 91ce542 + 0e8d4ff commit 14d28f5

27 files changed

+2630
-2512
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.

‎docs/poetry.lock‎

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

‎poetry.lock‎

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

‎pyproject.toml‎

Lines changed: 2 additions & 2 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.2.0"
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"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ template:
112112
and:
113113
- "contains(Name, '{Name}')"
114114
- "contains(Id, '{auxip:id}')"
115-
- "PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}"
116-
- "PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}"
115+
- "(PublicationDate gt {StartPublicationDate#to_iso_utc_datetime} or PublicationDate eq {StartPublicationDate#to_iso_utc_datetime})"
116+
- "(PublicationDate lt {StopPublicationDate#to_iso_utc_datetime} or PublicationDate eq {StopPublicationDate#to_iso_utc_datetime})"
117117
- "PublicationDate eq {PublicationDate#to_iso_utc_datetime}"
118118
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'productType' and att/OData.CSC.StringAttribute/Value eq '{attr_ptype}')"
119119
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformSerialIdentifier' and att/OData.CSC.StringAttribute/Value eq '{platformSerialIdentifier}')"

‎services/adgs/config/adgs_ws_config.yaml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,10 @@ adgs:
117117
and:
118118
- contains(Name, '{Name}')
119119
- contains(Id, '{auxip:id}')
120-
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
121-
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
120+
- (PublicationDate gt {StartPublicationDate#to_iso_utc_datetime} or PublicationDate
121+
eq {StartPublicationDate#to_iso_utc_datetime})
122+
- (PublicationDate lt {StopPublicationDate#to_iso_utc_datetime} or PublicationDate
123+
eq {StopPublicationDate#to_iso_utc_datetime})
122124
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
123125
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'productType'
124126
and att/OData.CSC.StringAttribute/Value eq '{attr_ptype}')
@@ -257,9 +259,16 @@ adgs2:
257259
operations:
258260
and:
259261
- contains(Name, '{Name}')
262+
<<<<<<< HEAD
260263
- contains(Id, '{auxip:id}')
261264
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
262265
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
266+
=======
267+
- (PublicationDate gt {StartPublicationDate#to_iso_utc_datetime} or PublicationDate
268+
eq {StartPublicationDate#to_iso_utc_datetime})
269+
- (PublicationDate lt {StopPublicationDate#to_iso_utc_datetime} or PublicationDate
270+
eq {StopPublicationDate#to_iso_utc_datetime})
271+
>>>>>>> develop
263272
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
264273
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'productType'
265274
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
@@ -99,8 +99,8 @@ template:
9999
and:
100100
- "contains(Name, '{Name}')"
101101
- "contains(Id, '{auxip:id}')"
102-
- "PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}"
103-
- "PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}"
102+
- "(PublicationDate gt {StartPublicationDate#to_iso_utc_datetime} or PublicationDate eq {StartPublicationDate#to_iso_utc_datetime})"
103+
- "(PublicationDate lt {StopPublicationDate#to_iso_utc_datetime} or PublicationDate eq {StopPublicationDate#to_iso_utc_datetime})"
104104
- "PublicationDate eq {PublicationDate#to_iso_utc_datetime}"
105105
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'productType' and att/OData.CSC.StringAttribute/Value eq '{attr_ptype}')"
106106
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformSerialIdentifier' and att/OData.CSC.StringAttribute/Value eq '{platformSerialIdentifier}')"

‎services/adgs/config/adgs_ws_config_token_module.yaml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,10 @@ adgs:
104104
and:
105105
- contains(Name, '{Name}')
106106
- contains(Id, '{auxip:id}')
107-
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
108-
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
107+
- (PublicationDate gt {StartPublicationDate#to_iso_utc_datetime} or PublicationDate
108+
eq {StartPublicationDate#to_iso_utc_datetime})
109+
- (PublicationDate lt {StopPublicationDate#to_iso_utc_datetime} or PublicationDate
110+
eq {StopPublicationDate#to_iso_utc_datetime})
109111
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
110112
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'productType'
111113
and att/OData.CSC.StringAttribute/Value eq '{attr_ptype}')
@@ -231,9 +233,16 @@ adgs2:
231233
operations:
232234
and:
233235
- contains(Name, '{Name}')
236+
<<<<<<< HEAD
234237
- contains(Id, '{auxip:id}')
235238
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
236239
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
240+
=======
241+
- (PublicationDate gt {StartPublicationDate#to_iso_utc_datetime} or PublicationDate
242+
eq {StartPublicationDate#to_iso_utc_datetime})
243+
- (PublicationDate lt {StopPublicationDate#to_iso_utc_datetime} or PublicationDate
244+
eq {StopPublicationDate#to_iso_utc_datetime})
245+
>>>>>>> develop
237246
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
238247
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'productType'
239248
and att/OData.CSC.StringAttribute/Value eq '{attr_ptype}')

0 commit comments

Comments
 (0)