From fd8fe9267c68e0cc467900366d55b253f48b5824 Mon Sep 17 00:00:00 2001 From: Ketan <73937490+devketanpro@users.noreply.github.com> Date: Wed, 13 Nov 2024 17:48:35 +0530 Subject: [PATCH] update core to develop (#201) --- client/package-lock.json | 8 ++++---- client/package.json | 2 +- server/requirements.in | 2 +- server/requirements.txt | 35 ++++++++++++++++++++--------------- 4 files changed, 26 insertions(+), 21 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index d83ed20..0f7cca4 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -3417,8 +3417,8 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, "newsroom-core": { - "version": "github:superdesk/newsroom-core#2a9dd68df1257fde554ee35cbdc2486c224c84bf", - "from": "github:superdesk/newsroom-core#2a9dd68df1257fde554ee35cbdc2486c224c84bf", + "version": "github:superdesk/newsroom-core#a93479f1bf72eacdbcc8cbd0c1a709aa6b949aec", + "from": "github:superdesk/newsroom-core#develop", "requires": { "@dnd-kit/core": "^6.0.8", "@dnd-kit/sortable": "^8.0.0", @@ -3431,7 +3431,7 @@ "@types/react-dom": "^17.0.1", "@types/react-toggle": "^4.0.5", "@types/redux-logger": "^3.0.9", - "@types/store": "^2.0.2", + "@types/store": "^2.0.5", "@types/webpack-env": "^1.18.5", "alertifyjs": "1.14.0", "bootstrap": "5.1.3", @@ -3445,7 +3445,7 @@ "moment-timezone": "0.5.41", "popper.js": "1.14.4", "primeicons": "^6.0.1", - "primereact": "^10.0.9", + "primereact": "^10.8.4", "react": "^17.0.2", "react-datepicker": "4.7.0", "react-dom": "^17.0.2", diff --git a/client/package.json b/client/package.json index 4949c73..8442355 100644 --- a/client/package.json +++ b/client/package.json @@ -4,6 +4,6 @@ "build": "webpack --mode production --progress" }, "dependencies": { - "newsroom-core": "github:superdesk/newsroom-core#release/2.8" + "newsroom-core": "github:superdesk/newsroom-core#develop" } } diff --git a/server/requirements.in b/server/requirements.in index 88abf15..e4e0b7c 100644 --- a/server/requirements.in +++ b/server/requirements.in @@ -1 +1 @@ -git+https://github.com/superdesk/newsroom-core.git@release/2.8#egg=Newsroom-Core +git+https://github.com/superdesk/newsroom-core.git@develop#egg=Newsroom-Core diff --git a/server/requirements.txt b/server/requirements.txt index ab6dac1..8016469 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -1,10 +1,10 @@ # -# This file is autogenerated by pip-compile with Python 3.10 +# This file is autogenerated by pip-compile with Python 3.9 # by the following command: # # pip-compile requirements.in # -amqp==5.2.0 +amqp==5.3.1 # via kombu arabic-reshaper==3.0.0 # via xhtml2pdf @@ -17,12 +17,14 @@ asn1crypto==1.5.1 # oscrypto # pyhanko # pyhanko-certvalidator -async-timeout==4.0.3 +async-timeout==5.0.1 # via redis authlib==0.14.3 # via superdesk-core babel==2.16.0 # via flask-babel +backports-entry-points-selectable==1.3.0 + # via honcho bcrypt==4.1.3 # via superdesk-core billiard==4.2.1 @@ -30,13 +32,14 @@ billiard==4.2.1 blinker==1.8.2 # via # elastic-apm + # flask # flask-mail # raven # sentry-sdk # superdesk-core -boto3==1.35.39 +boto3==1.35.59 # via superdesk-core -botocore==1.35.39 +botocore==1.35.59 # via # boto3 # s3transfer @@ -84,9 +87,9 @@ click-plugins==1.1.1 # via celery click-repl==0.3.0 # via celery -croniter==3.0.3 +croniter==3.0.4 # via superdesk-core -cryptography==43.0.1 +cryptography==43.0.3 # via # authlib # jwcrypto @@ -156,7 +159,7 @@ flask-script==2.0.6 # via superdesk-core flask-webpack==0.1.0 # via newsroom-core -flask-wtf==1.2.1 +flask-wtf==1.2.2 # via newsroom-core future==1.0.0 # via python-twitter @@ -230,7 +233,7 @@ markupsafe==2.0.1 # wtforms mongolock @ git+https://github.com/superdesk/mongolock.git@v1 # via superdesk-core -newsroom-core @ git+https://github.com/superdesk/newsroom-core.git@release/2.8 +newsroom-core @ git+https://github.com/superdesk/newsroom-core.git@develop # via -r requirements.in oauth2client==4.1.3 # via flask-oidc-ex @@ -240,7 +243,7 @@ orderly-set==5.2.2 # via deepdiff oscrypto==1.3.0 # via pyhanko-certvalidator -packaging==24.1 +packaging==24.2 # via # gunicorn # limits @@ -283,7 +286,7 @@ pyparsing==3.2.0 # via # httplib2 # pyrtf3 -pypdf==5.0.1 +pypdf==5.1.0 # via xhtml2pdf pyrtf3==0.47.5 # via newsroom-core @@ -351,7 +354,7 @@ rsa==4.9 # oauth2client s3transfer==0.10.3 # via boto3 -sentry-sdk[flask]==2.13.0 +sentry-sdk[flask]==2.18.0 # via newsroom-core sgmllib3k==1.0.0 # via feedparser @@ -371,7 +374,7 @@ superdesk-planning @ git+https://github.com/superdesk/superdesk-planning.git@v2. # via newsroom-core svglib==1.5.1 # via xhtml2pdf -tinycss2==1.3.0 +tinycss2==1.4.0 # via # cssselect2 # svglib @@ -380,6 +383,7 @@ types-python-dateutil==2.9.0.20241003 typing-extensions==4.12.2 # via # jwcrypto + # kombu # limits # pypdf # superdesk-core @@ -426,17 +430,18 @@ wrapt==1.16.0 # via # deprecated # elastic-apm -wtforms[email]==3.1.2 +wtforms[email]==3.2.1 # via # flask-wtf # newsroom-core - # wtforms xhtml2pdf==0.2.16 # via newsroom-core xmlsec==1.3.14 # via # python3-saml # superdesk-core +zipp==3.21.0 + # via importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools