Merge pull request #940 from marwoodandrew/build-fix

Build fix depricated docker compose command, fix pip and setuptools version
superdesk · Oct 25, 2024 · 20a2655 · 20a2655
2 parents 416f873 + 285a88e
commit 20a2655
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 33 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -18,7 +18,7 @@ jobs:
       - run: |
           sudo apt-get update
           sudo apt-get -y install libxml2-dev libxmlsec1-dev libxmlsec1-openssl libexempi-dev unixodbc unixodbc-dev
-      - run: docker-compose -f ../.github/docker-compose.yml up -d
+      - run: docker compose -f ../.github/docker-compose.yml up -d
       - name: Cache pip
         uses: actions/cache@v2
         with:
@@ -28,7 +28,7 @@ jobs:
             ${{ runner.os }}-pip
             ${{ runner.os }}-
       - run: |
-          python -m pip install --upgrade pip wheel setuptools
+          python -m pip install --upgrade pip==24.0 wheel setuptools==70.3.0
           pip install -r dev-requirements.txt
       - run: python manage.py app:initialize_data
       - run: python manage.py users:create -u test -p test -e test@localhost --admin

diff --git a/scripts/docker-local-demo.sh b/scripts/docker-local-demo.sh
@@ -3,7 +3,7 @@
 set -ue
 
 function dcs() {
-	docker-compose -p sddemo -f ./docker-compose-prebuilt.yml $@
+	docker compose -p sddemo -f ./docker-compose-prebuilt.yml $@
 }
 
 WORK_DIR="$(echo $(cd -P -- "$(dirname -- "$0")" && pwd -P))"
@@ -30,6 +30,7 @@ echo '
 '
 
 cd $WORK_DIR/../docker
+
 dcs kill
 #dcs rm -fv
 dcs pull

diff --git a/server/requirements.txt b/server/requirements.txt
@@ -4,46 +4,52 @@
 #
 #    pip-compile requirements.in
 #
-amqp==2.6.1
+amqp==5.2.0
     # via kombu
 arrow==0.13.0
     # via
     #   eve-elastic
     #   superdesk-core
+async-timeout==4.0.3
+    # via redis
 authlib==0.14.3
     # via superdesk-core
-babel==2.15.0
+babel==2.16.0
     # via flask-babel
+backports-zoneinfo[tzdata]==0.2.1
+    # via
+    #   celery
+    #   kombu
 bcrypt==3.1.7
     # via superdesk-core
-billiard==3.6.4.0
+billiard==4.2.1
     # via celery
 blinker==1.4
     # via
     #   elastic-apm
     #   flask-mail
     #   raven
     #   superdesk-core
-boto3==1.34.117
+boto3==1.35.24
     # via superdesk-core
-botocore==1.34.117
+botocore==1.35.24
     # via
     #   boto3
     #   s3transfer
-cachetools==5.3.3
+cachetools==5.5.0
     # via flask-oidc-ex
-celery[redis]==4.4.7
+celery[redis]==5.4.0
     # via superdesk-core
 cerberus==1.3.5
     # via
     #   eve
     #   superdesk-core
-certifi==2024.6.2
+certifi==2024.8.30
     # via
     #   elastic-apm
     #   elasticsearch
     #   requests
-cffi==1.16.0
+cffi==1.17.1
     # via
     #   bcrypt
     #   cryptography
@@ -53,19 +59,32 @@ charset-normalizer==3.3.2
     # via requests
 ciso8601==1.0.8
     # via eve-elastic
-click==7.1.2
-    # via flask
+click==8.1.7
+    # via
+    #   celery
+    #   click-didyoumean
+    #   click-plugins
+    #   click-repl
+    #   flask
+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.7
+cryptography==43.0.1
     # via
     #   authlib
     #   jwcrypto
 deepdiff==3.3.0
     # via superdesk-planning
 draftjs-exporter[lxml]==2.1.0
     # via superdesk-core
-elastic-apm[flask]==6.7.2
+ecs-logging==2.2.0
+    # via elastic-apm
+elastic-apm[flask]==6.23.0
     # via superdesk-core
 elasticsearch==7.13.4
     # via eve-elastic
@@ -77,7 +96,7 @@ events==0.3
     # via eve
 feedparser==6.0.11
     # via superdesk-core
-flask==1.1.4
+flask==1.1.2
     # via
     #   eve
     #   flask-babel
@@ -112,29 +131,31 @@ httplib2==0.22.0
     # via oauth2client
 icalendar==4.0.9
     # via superdesk-planning
-idna==3.7
+idna==3.10
     # via requests
-importlib-metadata==3.1.1
+importlib-metadata==8.5.0
     # via superdesk-core
 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
-jsonpickle==3.0.4
+jsonpickle==3.3.0
     # via deepdiff
 jwcrypto==1.5.6
     # via
     #   flask-oidc-ex
     #   python-jwt
-kombu==4.6.11
+kombu==5.4.2
     # via
     #   celery
     #   superdesk-core
@@ -166,6 +187,8 @@ oauthlib==3.2.2
     # via requests-oauthlib
 pillow==9.2.0
     # via superdesk-core
+prompt-toolkit==3.0.47
+    # via click-repl
 protobuf==3.20.1
     # via
     #   -r requirements.in
@@ -179,7 +202,7 @@ pyasn1==0.4.8
     #   oauth2client
     #   pyasn1-modules
     #   rsa
-pyasn1-modules==0.4.0
+pyasn1-modules==0.4.1
     # via oauth2client
 pycparser==2.22
     # via cffi
@@ -190,12 +213,13 @@ pymongo==3.11.4
     #   superdesk-core
 pyodbc==4.0.32
     # via -r requirements.in
-pyparsing==3.1.2
+pyparsing==3.1.4
     # via httplib2
-python-dateutil==2.7.5
+python-dateutil==2.8.2
     # via
     #   arrow
     #   botocore
+    #   celery
     #   croniter
     #   icalendar
     #   superdesk-core
@@ -205,20 +229,19 @@ python-magic==0.4.27
     # via superdesk-core
 python-twitter==3.5
     # via superdesk-core
-pytz==2024.1
+pytz==2024.2
     # via
     #   babel
-    #   celery
     #   eve-elastic
     #   flask-babel
     #   icalendar
     #   superdesk-core
     #   tzlocal
-pyyaml==6.0.1
+pyyaml==6.0.2
     # via superdesk-core
 raven[flask]==6.10.0
     # via superdesk-core
-redis==3.2.1
+redis==4.5.4
     # via
     #   celery
     #   superdesk-core
@@ -235,11 +258,11 @@ requests-oauthlib==2.0.0
     # via python-twitter
 rsa==4.9
     # via oauth2client
-s3transfer==0.10.1
+s3transfer==0.10.2
     # via boto3
 sgmllib3k==1.0.0
     # via feedparser
-simplejson==3.19.2
+simplejson==3.19.3
     # via eve
 six==1.16.0
     # via
@@ -260,10 +283,15 @@ superdesk-planning @ git+https://github.com/superdesk/superdesk-planning.git@v2.
     # via -r requirements.in
 titlecase==0.8.2
     # via -r requirements.in
-typing-extensions==4.12.1
+typing-extensions==4.12.2
     # via
     #   jwcrypto
+    #   kombu
     #   superdesk-core
+tzdata==2024.1
+    # via
+    #   backports-zoneinfo
+    #   celery
 tzlocal==2.1
     # via superdesk-core
 unidecode==0.4.21
@@ -277,10 +305,13 @@ urllib3==1.25.11
     #   elasticsearch
     #   requests
     #   superdesk-core
-vine==1.3.0
+vine==5.1.0
     # via
     #   amqp
     #   celery
+    #   kombu
+wcwidth==0.2.13
+    # via prompt-toolkit
 websocket-client==0.59.0
     # via slackclient
 websockets==6.0
@@ -289,9 +320,11 @@ werkzeug==1.0.1
     # via
     #   flask
     #   superdesk-core
+wrapt==1.16.0
+    # via elastic-apm
 xmlsec==1.3.14
     # via superdesk-core
-zipp==3.19.1
+zipp==3.20.2
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file: