Skip to content

Commit

Permalink
update server core (#494)
Browse files Browse the repository at this point in the history
and fix ci
  • Loading branch information
petrjasek authored Apr 10, 2024
1 parent 7ed9a9c commit ddecdc4
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- run: sudo apt-get update
- run: sudo apt-get -y install libxmlsec1-dev

- run: docker-compose -f ../.github/docker-compose.yml up -d
- run: docker compose -f ../.github/docker-compose.yml up -d

- run: |
python -m pip install --upgrade pip wheel setuptools
Expand Down
2 changes: 1 addition & 1 deletion server/requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ honcho
feedgen==0.7.0
openpyxl==3.0.7

git+https://github.com/superdesk/superdesk-core.git@hotfix/2.6.5#egg=superdesk-core
git+https://github.com/superdesk/superdesk-core.git@hotfix/2.6.8#egg=superdesk-core
git+https://github.com/superdesk/superdesk-planning.git@hotfix/2.6.3#egg=superdesk-planning
39 changes: 19 additions & 20 deletions server/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile requirements.in
Expand All @@ -26,13 +26,13 @@ blinker==1.4
# flask-mail
# raven
# superdesk-core
boto3==1.34.45
boto3==1.34.81
# via superdesk-core
botocore==1.34.45
botocore==1.34.81
# via
# boto3
# s3transfer
cachetools==5.3.2
cachetools==5.3.3
# via flask-oidc-ex
celery[redis]==5.2.7
# via superdesk-core
Expand Down Expand Up @@ -62,25 +62,25 @@ click==8.1.7
# click-plugins
# click-repl
# flask
click-didyoumean==0.3.0
click-didyoumean==0.3.1
# via celery
click-plugins==1.1.1
# via celery
click-repl==0.3.0
# via celery
croniter==0.3.37
# via superdesk-core
cryptography==42.0.3
cryptography==42.0.5
# via
# authlib
# jwcrypto
deepdiff==6.7.1
deepdiff==7.0.1
# via superdesk-planning
draftjs-exporter[lxml]==2.1.7
# via superdesk-core
ecs-logging==2.1.0
# via elastic-apm
elastic-apm[flask]==6.20.0
elastic-apm[flask]==6.22.0
# via superdesk-core
elasticsearch==7.13.4
# via eve-elastic
Expand Down Expand Up @@ -113,7 +113,7 @@ flask-oidc-ex==0.5.5
# via superdesk-core
flask-script==2.0.6
# via superdesk-core
future==0.18.3
future==1.0.0
# via python-twitter
gunicorn==21.2.0
# via -r requirements.in
Expand Down Expand Up @@ -143,7 +143,7 @@ jmespath==1.0.1
# via
# boto3
# botocore
jwcrypto==1.5.4
jwcrypto==1.5.6
# via
# flask-oidc-ex
# python-jwt
Expand Down Expand Up @@ -174,28 +174,28 @@ openpyxl==3.0.7
# via -r requirements.in
ordered-set==4.1.0
# via deepdiff
packaging==23.2
packaging==24.0
# via gunicorn
pillow==9.2.0
# via superdesk-core
prompt-toolkit==3.0.43
# via click-repl
pyasn1==0.5.1
pyasn1==0.6.0
# via
# ldap3
# oauth2client
# pyasn1-modules
# rsa
pyasn1-modules==0.3.0
pyasn1-modules==0.4.0
# via oauth2client
pycparser==2.21
pycparser==2.22
# via cffi
pymongo==3.11.4
# via
# eve
# mongolock
# superdesk-core
pyparsing==3.1.1
pyparsing==3.1.2
# via httplib2
python-dateutil==2.7.5
# via
Expand All @@ -213,7 +213,6 @@ python-twitter==3.5
# via superdesk-core
pytz==2024.1
# via
# babel
# celery
# eve-elastic
# flask-babel
Expand All @@ -235,11 +234,11 @@ requests==2.31.0
# python-twitter
# requests-oauthlib
# superdesk-core
requests-oauthlib==1.3.1
requests-oauthlib==2.0.0
# via python-twitter
rsa==4.9
# via oauth2client
s3transfer==0.10.0
s3transfer==0.10.1
# via boto3
sgmllib3k==1.0.0
# via feedparser
Expand All @@ -251,11 +250,11 @@ six==1.16.0
# flask-oidc-ex
# oauth2client
# python-dateutil
superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@hotfix/2.6.5
superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@hotfix/2.6.8
# via -r requirements.in
superdesk-planning @ git+https://github.com/superdesk/superdesk-planning.git@hotfix/2.6.3
# via -r requirements.in
typing-extensions==4.9.0
typing-extensions==4.11.0
# via
# jwcrypto
# superdesk-core
Expand Down

0 comments on commit ddecdc4

Please sign in to comment.