Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into uat
Browse files Browse the repository at this point in the history
  • Loading branch information
@petrjasek
petrjasek committed Nov 19, 2024
2 parents f33f371 + 5c46863 commit 0a70adc
Show file tree
Hide file tree
Showing 12 changed files with 997 additions and 971 deletions.
23 changes: 19 additions & 4 deletions .github/dependabot.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,26 @@

version: 2
updates:
- package-ecosystem: "npm" # See documentation for possible values
directory: "/client" # Location of package manifests
# develop branch
- package-ecosystem: "npm"
directory: "/client"
schedule:
interval: "weekly"
- package-ecosystem: "pip" # See documentation for possible values
directory: "/server" # Location of package manifests

- package-ecosystem: "pip"
directory: "/server"
schedule:
interval: "weekly"

# next branch
- package-ecosystem: "npm"
directory: "/client"
target-branch: "next"
schedule:
interval: "daily"

- package-ecosystem: "pip"
directory: "/server"
target-branch: "next"
schedule:
interval: "daily"
1,490 changes: 558 additions & 932 deletions client/package-lock.json
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"name": "superdesk",
"license": "AGPL-3.0",
"dependencies": {
"superdesk-core": "github:superdesk/superdesk-client-core#v2.7.0",
"superdesk-planning": "github:superdesk/superdesk-planning#v2.7.0"
"superdesk-core": "github:superdesk/superdesk-client-core#release/2.8",
"superdesk-planning": "github:superdesk/superdesk-planning#release/2.8"
},
"scripts": {
"build": "npx @superdesk/build-tools build-root-repo ./",
Expand Down
125 changes: 125 additions & 0 deletions server/features/ingest_planning.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -495,3 +495,128 @@ Feature: Ingest STT Planning items
}
]}
"""

@auth
@stt_cvs
@stt_providers
Scenario: Unlinks content from planning on remove signal
When we fetch from "STTNewsML" ingest "stt_newsml_link_content.xml" using routing_scheme
"""
#routing_schemes._id#
"""
When we fetch from "STTPlanningML" ingest "planning_ml_link_content.xml"
When we get "/assignments"
Then we get list with 1 items
Then we store "assignment" with first item
When we get "/planning"
Then we get list with 1 items
"""
{"_items": [{
"_id": "urn:newsml:stt.fi:437036",
"coverages": [{
"coverage_id": "ID_TEXT_120123822",
"workflow_status": "active",
"assigned_to": {
"assignment_id": "#assignment._id#",
"desk": "#desks._id#",
"user": null,
"state": "completed",
"priority": 6
}
}]
}]}
"""
When we get "published"
Then we get list with 1 items
"""
{"_items": [{
"uri": "urn:newsml:stt.fi:101801633",
"assignment_id": "#assignment._id#"
}]}
"""
When we fetch from "STTPlanningML" ingest "planning_ml_link_content_delete.xml"
When we get "/assignments"
Then we get list with 0 items
When we get "/planning"
Then we get list with 1 items
"""
{"_items": [{
"_id": "urn:newsml:stt.fi:437036",
"coverages": [{
"coverage_id": "ID_TEXT_120123822",
"assigned_to": "__empty__",
"workflow_status": "draft"
}]
}]}
"""
When we get "published"
Then we get list with 1 items
"""
{"_items": [{
"uri": "urn:newsml:stt.fi:101801633",
"assignment_id": null
}]}
"""

@auth
@stt_cvs
@stt_providers
Scenario: Unlinks content from event on remove signal
When we fetch from "STTNewsML" ingest "stt_newsml_link_content.xml" using routing_scheme
"""
#routing_schemes._id#
"""
When we fetch from "STTEventsML" ingest "events_ml_259431.xml"
When we fetch from "STTPlanningML" ingest "planning_ml_437036_link_content_and_event.xml"
When we get "/assignments"
Then we get list with 1 items
Then we store "assignment" with first item
When we get "/planning"
Then we get list with 1 items
"""
{"_items": [{
"_id": "urn:newsml:stt.fi:437036",
"coverages": [{
"coverage_id": "ID_TEXT_120123822",
"workflow_status": "active",
"assigned_to": {
"assignment_id": "#assignment._id#",
"desk": "#desks._id#",
"user": null,
"state": "completed",
"priority": 6
}
}]
}]}
"""
When we get "published"
Then we get list with 1 items
"""
{"_items": [{
"uri": "urn:newsml:stt.fi:101801633",
"assignment_id": "#assignment._id#"
}]}
"""
When we fetch from "STTEventsML" ingest "events_ml_259431_delete.xml"
When we get "/assignments"
Then we get list with 0 items
When we get "/planning"
Then we get list with 1 items
"""
{"_items": [{
"_id": "urn:newsml:stt.fi:437036",
"coverages": [{
"coverage_id": "ID_TEXT_120123822",
"assigned_to": "__empty__",
"workflow_status": "draft"
}]
}]}
"""
When we get "published"
Then we get list with 1 items
"""
{"_items": [{
"uri": "urn:newsml:stt.fi:101801633",
"assignment_id": null
}]}
"""
4 changes: 2 additions & 2 deletions server/requirements.in
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
gunicorn
honcho

git+https://github.com/superdesk/superdesk-core.git@v2.7.3#egg=superdesk-core
git+https://github.com/superdesk/superdesk-planning.git@release/2.7#egg=superdesk-planning
git+https://github.com/superdesk/superdesk-core.git@release/2.8#egg=superdesk-core
git+https://github.com/superdesk/superdesk-planning.git@release/2.8#egg=superdesk-planning
65 changes: 38 additions & 27 deletions server/requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
amqp==5.2.0
# via kombu
arrow==0.13.0
arrow==1.3.0
# via
# eve-elastic
# superdesk-core
Expand All @@ -18,23 +18,23 @@ babel==2.16.0
# via flask-babel
bcrypt==4.1.3
# via superdesk-core
billiard==3.6.4.0
billiard==4.2.0
# via celery
blinker==1.7.0
blinker==1.8.2
# via
# elastic-apm
# flask-mail
# raven
# superdesk-core
boto3==1.35.16
boto3==1.35.23
# via superdesk-core
botocore==1.35.16
botocore==1.35.23
# via
# boto3
# s3transfer
cachetools==5.5.0
# via flask-oidc-ex
celery[redis]==5.2.7
celery[redis]==5.4.0
# via superdesk-core
cerberus==1.3.5
# via
Expand All @@ -48,7 +48,9 @@ certifi==2024.8.30
cffi==1.17.1
# via cryptography
chardet==5.2.0
# via superdesk-core
# via
# reportlab
# superdesk-core
charset-normalizer==3.3.2
# via requests
ciso8601==2.3.1
Expand All @@ -67,15 +69,15 @@ click-plugins==1.1.1
# via celery
click-repl==0.3.0
# via celery
croniter==2.0.7
croniter==3.0.3
# via superdesk-core
cryptography==43.0.1
# via
# authlib
# jwcrypto
deepdiff==8.0.1
# via superdesk-planning
draftjs-exporter[lxml]==2.1.7
draftjs-exporter[lxml]==2.1.0
# via superdesk-core
ecs-logging==2.2.0
# via elastic-apm
Expand Down Expand Up @@ -104,27 +106,27 @@ flask==1.1.2
# superdesk-core
flask-babel==2.0.0
# via superdesk-core
flask-mail==0.9.1
flask-mail==0.10.0
# via superdesk-core
flask-oidc-ex==0.5.5
flask-oidc-ex==0.6.2
# via superdesk-core
flask-script==2.0.6
# via superdesk-core
future==1.0.0
# via python-twitter
gunicorn==23.0.0
# via -r requirements.in
hachoir==3.0a3
hachoir==3.3.0
# via superdesk-core
hermescache==0.10.0
hermescache==1.0.0
# via superdesk-core
honcho==1.1.0
honcho==2.0.0
# via -r requirements.in
httplib2==0.22.0
# via oauth2client
icalendar==4.0.9
icalendar==5.0.13
# via superdesk-planning
idna==3.8
idna==3.10
# via requests
itsdangerous==1.1.0
# via
Expand All @@ -144,17 +146,20 @@ jwcrypto==1.5.6
# via
# flask-oidc-ex
# python-jwt
kombu==5.2.4
kombu==5.4.2
# via
# celery
# superdesk-core
ldap3==2.5.2
ldap3==2.9.1
# via superdesk-core
lxml==4.6.5
lxml==5.2.2
# via
# draftjs-exporter
# lxml-html-clean
# superdesk-core
# xmlsec
lxml-html-clean==0.2.2
# via superdesk-core
markupsafe==2.0.1
# via
# jinja2
Expand All @@ -169,7 +174,7 @@ orderly-set==5.2.2
# via deepdiff
packaging==24.1
# via gunicorn
pillow==9.2.0
pillow==10.4.0
# via
# reportlab
# superdesk-core
Expand All @@ -185,7 +190,7 @@ pyasn1-modules==0.4.1
# via oauth2client
pycparser==2.22
# via cffi
pyjwt==2.4.0
pyjwt==2.8.0
# via superdesk-core
pymemcache==4.0.0
# via superdesk-core
Expand All @@ -200,6 +205,7 @@ python-dateutil==2.9.0.post0
# via
# arrow
# botocore
# celery
# croniter
# icalendar
# superdesk-core
Expand All @@ -211,7 +217,6 @@ python-twitter==3.5
# via superdesk-core
pytz==2024.2
# via
# celery
# croniter
# eve-elastic
# flask-babel
Expand All @@ -226,9 +231,9 @@ redis==5.0.8
# via
# celery
# superdesk-core
regex==2020.7.14
regex==2024.7.24
# via superdesk-core
reportlab==3.6.13
reportlab==4.2.2
# via superdesk-core
requests==2.32.3
# via
Expand All @@ -250,14 +255,20 @@ six==1.16.0
# flask-oidc-ex
# oauth2client
# python-dateutil
superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@v2.7.3
superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@release/2.8
# via -r requirements.in
superdesk-planning @ git+https://github.com/superdesk/superdesk-planning.git@release/2.7
superdesk-planning @ git+https://github.com/superdesk/superdesk-planning.git@release/2.8
# via -r requirements.in
types-python-dateutil==2.9.0.20240906
# via arrow
typing-extensions==4.12.2
# via
# jwcrypto
# superdesk-core
tzdata==2024.1
# via
# celery
# kombu
tzlocal==2.1
# via superdesk-core
unidecode==1.3.8
Expand All @@ -284,5 +295,5 @@ werkzeug==1.0.1
# superdesk-core
wrapt==1.16.0
# via elastic-apm
xmlsec==1.3.13
xmlsec==1.3.14
# via superdesk-core
Loading

0 comments on commit 0a70adc

Please sign in to comment.