Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TGA-45] Update IVocabulary interface with selection_type #4300

Merged
merged 2 commits into from
Jul 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion e2e/server/requirements.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
honcho
gunicorn
git+https://github.com/superdesk/superdesk-core.git@v2.6.0#egg=Superdesk-Core
git+https://github.com/superdesk/superdesk-core.git@hotfix/2.6.5#egg=Superdesk-Core
83 changes: 55 additions & 28 deletions e2e/server/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
#
# This file is autogenerated by pip-compile with Python 3.10
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile --resolver=backtracking requirements.in
# pip-compile requirements.in
#
amqp==2.6.1
amqp==5.1.1
# via kombu
arrow==0.13.0
# via
# eve-elastic
# superdesk-core
async-timeout==4.0.2
# via redis
authlib==0.14.3
# via superdesk-core
babel==2.12.1
Expand All @@ -24,21 +26,21 @@ blinker==1.4
# flask-mail
# raven
# superdesk-core
boto3==1.26.119
boto3==1.28.10
# via superdesk-core
botocore==1.29.119
botocore==1.31.10
# via
# boto3
# s3transfer
cachetools==5.3.0
cachetools==5.3.1
# via flask-oidc-ex
celery[redis]==4.4.7
celery[redis]==5.2.7
# via superdesk-core
cerberus==1.3.4
# via
# eve
# superdesk-core
certifi==2022.12.7
certifi==2023.7.22
# via
# elastic-apm
# elasticsearch
Expand All @@ -49,23 +51,36 @@ cffi==1.15.1
# cryptography
chardet==3.0.4
# via superdesk-core
charset-normalizer==3.1.0
charset-normalizer==3.2.0
# via requests
ciso8601==1.0.8
# via eve-elastic
click==7.1.2
# via flask
click==8.1.6
# via
# celery
# click-didyoumean
# click-plugins
# click-repl
# flask
click-didyoumean==0.3.0
# via celery
click-plugins==1.1.1
# via celery
click-repl==0.3.0
# via celery
croniter==0.3.37
# via superdesk-core
cryptography==40.0.2
cryptography==41.0.2
# via
# authlib
# jwcrypto
deprecated==1.2.13
deprecated==1.2.14
# via jwcrypto
draftjs-exporter[lxml]==2.1.7
# via superdesk-core
elastic-apm[flask]==6.7.2
ecs-logging==2.0.2
# via elastic-apm
elastic-apm[flask]==6.17.0
# via superdesk-core
elasticsearch==7.13.4
# via eve-elastic
Expand All @@ -77,7 +92,7 @@ events==0.3
# via eve
feedparser==6.0.10
# via superdesk-core
flask==1.1.4
flask==1.1.2
# via
# eve
# flask-babel
Expand All @@ -96,7 +111,7 @@ flask-script==2.0.6
# via superdesk-core
future==0.18.3
# via python-twitter
gunicorn==20.1.0
gunicorn==21.2.0
# via -r requirements.in
hachoir==3.0a3
# via superdesk-core
Expand All @@ -112,19 +127,21 @@ itsdangerous==1.1.0
# via
# flask
# flask-oidc-ex
# superdesk-core
jinja2==2.11.3
# via
# flask
# flask-babel
# superdesk-core
jmespath==1.0.1
# via
# boto3
# botocore
jwcrypto==1.4.2
jwcrypto==1.5.0
# via
# flask-oidc-ex
# python-jwt
kombu==4.6.11
kombu==5.2.4
# via
# celery
# superdesk-core
Expand All @@ -140,14 +157,18 @@ markupsafe==2.0.1
# superdesk-core
mongolock==1.3.4
# via superdesk-core
natsort==8.3.1
natsort==8.4.0
# via croniter
oauth2client==4.1.3
# via flask-oidc-ex
oauthlib==3.2.2
# via requests-oauthlib
packaging==23.1
# via gunicorn
pillow==9.2.0
# via superdesk-core
prompt-toolkit==3.0.39
# via click-repl
pyasn1==0.5.0
# via
# ldap3
Expand All @@ -163,7 +184,7 @@ pymongo==3.11.4
# eve
# mongolock
# superdesk-core
pyparsing==3.0.9
pyparsing==3.1.0
# via httplib2
python-dateutil==2.7.5
# via
Expand All @@ -179,22 +200,23 @@ python-twitter==3.5
# via superdesk-core
pytz==2023.3
# via
# babel
# celery
# eve-elastic
# flask-babel
# superdesk-core
# tzlocal
pyyaml==5.4.1
pyyaml==6.0.1
# via superdesk-core
raven[flask]==6.10.0
# via superdesk-core
redis==3.2.1
redis==4.5.5
# via
# celery
# superdesk-core
regex==2020.7.14
# via superdesk-core
requests==2.28.2
requests==2.31.0
# via
# python-twitter
# requests-oauthlib
Expand All @@ -203,7 +225,7 @@ requests-oauthlib==1.3.1
# via python-twitter
rsa==4.9
# via oauth2client
s3transfer==0.6.0
s3transfer==0.6.1
# via boto3
sgmllib3k==1.0.0
# via feedparser
Expand All @@ -215,9 +237,9 @@ six==1.16.0
# flask-oidc-ex
# oauth2client
# python-dateutil
superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@v2.6.0
superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@hotfix/2.6.5
# via -r requirements.in
typing-extensions==4.5.0
typing-extensions==4.7.1
# via superdesk-core
tzlocal==2.1
# via superdesk-core
Expand All @@ -230,18 +252,23 @@ urllib3==1.25.11
# elasticsearch
# requests
# superdesk-core
vine==1.3.0
vine==5.0.0
# via
# amqp
# celery
# kombu
wcwidth==0.2.6
# via prompt-toolkit
websockets==10.3
# via superdesk-core
werkzeug==1.0.1
# via
# flask
# superdesk-core
wrapt==1.15.0
# via deprecated
# via
# deprecated
# elastic-apm

# The following packages are considered to be unsafe in a requirements file:
# setuptools
1 change: 1 addition & 0 deletions scripts/core/superdesk-api.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -745,6 +745,7 @@ declare module 'superdesk-api' {
preffered_items?: boolean;
tags?: Array<IVocabularyTag>;
disable_entire_category_selection?: boolean;
selection_type?: 'single selection' | 'multi selection' | 'do not show';
}

export interface IArticleField extends IVocabulary {
Expand Down
Loading