Merge pull request #906 from MarkLark86/release/2.5

chore: Update cores to latest v2.5.x RC versions

client/package.json

@@ -3,9 +3,9 @@
     "name": "superdesk",
     "license": "GPL-3.0",
     "dependencies": {
-        "superdesk-core": "github:marwoodandrew/superdesk-client-core#DST-FIX",
-        "superdesk-planning": "github:superdesk/superdesk-planning#hotfix/2.5.2",
-        "superdesk-analytics": "github:superdesk/superdesk-analytics#hotfix/2.5.2"
+        "superdesk-core": "github:superdesk/superdesk-client-core#v2.5.3-rc2",
+        "superdesk-planning": "github:superdesk/superdesk-planning#v2.5.2-rc2",
+        "superdesk-analytics": "github:superdesk/superdesk-analytics#v2.5.2-rc2"
     },
     "devDependencies": {
         "@superdesk/build-tools": "^1.0.18"

server/requirements.in

@@ -17,5 +17,5 @@ gspread==3.1.0
 oauth2client==4.1.3
 
 git+https://github.com/superdesk/[email protected]#egg=superdesk-core
-git+https://github.com/superdesk/[email protected]rc1#egg=superdesk-planning
-git+https://github.com/superdesk/[email protected]rc1#egg=superdesk-analytics
+git+https://github.com/superdesk/[email protected]rc2#egg=superdesk-planning
+git+https://github.com/superdesk/[email protected]rc2#egg=superdesk-analytics

server/requirements.txt

@@ -1,8 +1,8 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.8
+# by the following command:
 #
-#    pip-compile requirements.in
+#    pip-compile --resolver=backtracking requirements.in
 #
 amqp==2.6.1
     # via kombu
@@ -250,19 +250,19 @@ six==1.16.0
     #   websocket-client
 slackclient==1.0.9
     # via -r requirements.in
-superdesk-analytics @ git+https://github.com/superdesk/[email protected]rc1
+superdesk-analytics @ git+https://github.com/superdesk/[email protected]rc2
     # via -r requirements.in
 superdesk-core @ git+https://github.com/superdesk/[email protected]
     # via -r requirements.in
-superdesk-planning @ git+https://github.com/superdesk/[email protected]rc1
+superdesk-planning @ git+https://github.com/superdesk/[email protected]rc2
     # via -r requirements.in
 titlecase==0.8.2
     # via -r requirements.in
 typing-extensions==4.4.0
     # via superdesk-core
 tzlocal==2.1
     # via superdesk-core
-unidecode==0.04.21
+unidecode==0.4.21
     # via
     #   -r requirements.in
     #   superdesk-core