diff --git a/client/package-lock.json b/client/package-lock.json index 334319dc..b12e10fa 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -65,6 +65,13 @@ "integrity": "sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==", "requires": { "regenerator-runtime": "^0.13.11" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.13.11", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", + "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" + } } }, "@material-ui/lab": { @@ -206,11 +213,53 @@ } }, "@superdesk/primereact": { - "version": "5.0.2-4", - "resolved": "https://registry.npmjs.org/@superdesk/primereact/-/primereact-5.0.2-4.tgz", - "integrity": "sha512-QMrr4xtH2hexuPt+Rhv1GviAdMvOdtp4keKq1HkZYwG5mRqbRHcflOu8KxeQDftkpAqrjB5fniAEKEs+aeGciQ==", + "version": "5.0.2-8", + "resolved": "https://registry.npmjs.org/@superdesk/primereact/-/primereact-5.0.2-8.tgz", + "integrity": "sha512-KsqnypKVtAcEWsk0pQS5uZRNN5m7hDVH5RIkLeTO4YQU492pVRs3AhNkfzLKJENVU1D8VUrsJKG/T1wXnFafTQ==", "requires": { "react-transition-group": "^4.4.1" + }, + "dependencies": { + "csstype": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz", + "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==" + }, + "dom-helpers": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz", + "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==", + "requires": { + "@babel/runtime": "^7.8.7", + "csstype": "^3.0.2" + } + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" + }, + "prop-types": { + "version": "15.8.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", + "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", + "requires": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.13.1" + } + }, + "react-transition-group": { + "version": "4.4.5", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz", + "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==", + "requires": { + "@babel/runtime": "^7.5.5", + "dom-helpers": "^5.0.1", + "loose-envify": "^1.4.0", + "prop-types": "^15.6.2" + } + } } }, "@types/angular": { @@ -307,13 +356,6 @@ "requires": { "@types/prop-types": "*", "csstype": "^2.2.0" - }, - "dependencies": { - "csstype": { - "version": "2.6.21", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz", - "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==" - } } }, "@types/react-autocomplete": { @@ -1054,13 +1096,6 @@ "requires": { "core-js": "^2.4.0", "regenerator-runtime": "^0.11.0" - }, - "dependencies": { - "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" - } } }, "balanced-match": { @@ -2313,6 +2348,14 @@ } } }, + "css-box-model": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/css-box-model/-/css-box-model-1.2.1.tgz", + "integrity": "sha512-a7Vr4Q/kd/aw96bnJG332W9V9LkJO69JRcaCYDUqjp6/z0w6VcZjgAcTbgFxEPfBgdnAwlh3iwu+hLopa+flJw==", + "requires": { + "tiny-invariant": "^1.0.6" + } + }, "css-color-names": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", @@ -2438,9 +2481,9 @@ } }, "csstype": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz", - "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==" + "version": "2.6.21", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz", + "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==" }, "csurf": { "version": "1.8.3", @@ -2755,12 +2798,11 @@ } }, "dom-helpers": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz", - "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz", + "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==", "requires": { - "@babel/runtime": "^7.8.7", - "csstype": "^3.0.2" + "@babel/runtime": "^7.1.2" } }, "dom-scroll-into-view": { @@ -7668,6 +7710,11 @@ } } }, + "memoize-one": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz", + "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==" + }, "memory-fs": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", @@ -9902,6 +9949,11 @@ "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==" }, + "raf-schd": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/raf-schd/-/raf-schd-4.0.3.tgz", + "integrity": "sha512-tQkJl2GRWh83ui2DiPTJz9wEiMN20syf+5oKfB03yYP7ioZcJwsIK8FjrtLwH1m7C7e+Tt2yYBlrOpdT+dyeIQ==" + }, "random-bytes": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz", @@ -10014,6 +10066,20 @@ "prop-types": "^15.5.10" } }, + "react-beautiful-dnd": { + "version": "13.1.1", + "resolved": "https://registry.npmjs.org/react-beautiful-dnd/-/react-beautiful-dnd-13.1.1.tgz", + "integrity": "sha512-0Lvs4tq2VcrEjEgDXHjT98r+63drkKEgqyxdA7qD3mvKwga6a5SscbdLPO2IExotU1jW8L0Ksdl0Cj2AF67nPQ==", + "requires": { + "@babel/runtime": "^7.9.2", + "css-box-model": "^1.2.0", + "memoize-one": "^5.1.1", + "raf-schd": "^4.0.2", + "react-redux": "^7.2.0", + "redux": "^4.0.4", + "use-memo-one": "^1.1.1" + } + }, "react-bootstrap": { "version": "0.32.1", "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-0.32.1.tgz", @@ -10031,44 +10097,6 @@ "react-transition-group": "^2.0.0", "uncontrollable": "^4.1.0", "warning": "^3.0.0" - }, - "dependencies": { - "dom-helpers": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz", - "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==", - "requires": { - "@babel/runtime": "^7.1.2" - } - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" - }, - "react-transition-group": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz", - "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==", - "requires": { - "dom-helpers": "^3.4.0", - "loose-envify": "^1.4.0", - "prop-types": "^15.6.2", - "react-lifecycles-compat": "^3.0.4" - }, - "dependencies": { - "prop-types": { - "version": "15.8.1", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", - "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", - "requires": { - "loose-envify": "^1.4.0", - "object-assign": "^4.1.1", - "react-is": "^16.13.1" - } - } - } - } } }, "react-debounce-input": { @@ -10180,44 +10208,6 @@ "prop-types-extra": "^1.0.1", "react-transition-group": "^2.2.0", "warning": "^3.0.0" - }, - "dependencies": { - "dom-helpers": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz", - "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==", - "requires": { - "@babel/runtime": "^7.1.2" - } - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" - }, - "react-transition-group": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz", - "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==", - "requires": { - "dom-helpers": "^3.4.0", - "loose-envify": "^1.4.0", - "prop-types": "^15.6.2", - "react-lifecycles-compat": "^3.0.4" - }, - "dependencies": { - "prop-types": { - "version": "15.8.1", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", - "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", - "requires": { - "loose-envify": "^1.4.0", - "object-assign": "^4.1.1", - "react-is": "^16.13.1" - } - } - } - } } }, "react-paginate": { @@ -10292,6 +10282,16 @@ } } }, + "react-scrollspy": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/react-scrollspy/-/react-scrollspy-3.4.3.tgz", + "integrity": "sha512-c2QZpMPWxm1HF71h1EqaxBldx2zLYO0aZ24Bcuo2mUWF79T+F6qOtr7XJCzUDm99NOwhVKQD01a7A8VC6c90CQ==", + "requires": { + "babel-runtime": "^6.26.0", + "classnames": "^2.2.5", + "prop-types": "^15.5.10" + } + }, "react-sortable-hoc": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/react-sortable-hoc/-/react-sortable-hoc-2.0.0.tgz", @@ -10311,14 +10311,14 @@ } }, "react-transition-group": { - "version": "4.4.5", - "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz", - "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==", + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz", + "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==", "requires": { - "@babel/runtime": "^7.5.5", - "dom-helpers": "^5.0.1", + "dom-helpers": "^3.4.0", "loose-envify": "^1.4.0", - "prop-types": "^15.6.2" + "prop-types": "^15.6.2", + "react-lifecycles-compat": "^3.0.4" }, "dependencies": { "object-assign": { @@ -10507,9 +10507,9 @@ "dev": true }, "regenerator-runtime": { - "version": "0.13.11", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", - "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" }, "regex-cache": { "version": "0.4.4", @@ -11992,8 +11992,8 @@ } }, "superdesk-analytics": { - "version": "github:superdesk/superdesk-analytics#9c06fe00a35217134cfc0d70932c526c6eab24a7", - "from": "github:superdesk/superdesk-analytics#v2.5.1", + "version": "github:superdesk/superdesk-analytics#f2a2b762d7aa70b454a8e0dd433ed7118535b9dd", + "from": "github:superdesk/superdesk-analytics#v2.6.0-rc1", "requires": { "angular-embed": "github:superdesk/angular-embed#d75968e", "angular-embedly": "github:Urigo/angular-embedly#0.0.8", @@ -12007,12 +12007,11 @@ } }, "superdesk-core": { - "version": "github:superdesk/superdesk-client-core#974ea83f368d7eb9887064852e470e38ae1b620c", - "from": "github:superdesk/superdesk-client-core#v2.5.2", + "version": "github:superdesk/superdesk-client-core#3f867e21c2f7cbcb7adda66ee749e29df2806687", + "from": "github:superdesk/superdesk-client-core#v2.6.0", "requires": { "@metadata/exif": "github:superdesk/exif#431066d", "@popperjs/core": "2.10.2", - "@superdesk/primereact": "5.0.2-4", "@types/angular": "1.6.50", "@types/draft-js": "0.10.29", "@types/enzyme": "3.9.1", @@ -12102,7 +12101,7 @@ "sass-loader": "6.0.6", "shortid": "2.2.8", "style-loader": "0.20.2", - "superdesk-ui-framework": "2.4.20", + "superdesk-ui-framework": "3.0.0-rc12", "ts-loader": "3.5.0", "tslint": "5.11.0", "typescript": "3.9.7", @@ -12120,8 +12119,8 @@ } }, "superdesk-planning": { - "version": "github:superdesk/superdesk-planning#f12d3a4e6d22f2cdd04b512eb80eee13805efa12", - "from": "github:superdesk/superdesk-planning#v2.5.1", + "version": "github:superdesk/superdesk-planning#a2ac408b52aec764fc2762f6b62c89db1bcdc4ee", + "from": "github:superdesk/superdesk-planning#v2.6.0", "requires": { "dompurify": "^1.0.11", "nominatim-browser": "~2.0.2", @@ -12135,6 +12134,7 @@ "redux-logger": "~3.0.6", "reselect": "~3.0.1", "rrule": "~2.2.9", + "superdesk-ui-framework": "^3.0.0-rc12", "ts-loader": "3.5.0", "typescript": "3.9.7", "whatwg-fetch": "~2.0.4" @@ -12148,26 +12148,34 @@ } }, "superdesk-ui-framework": { - "version": "2.4.20", - "resolved": "https://registry.npmjs.org/superdesk-ui-framework/-/superdesk-ui-framework-2.4.20.tgz", - "integrity": "sha512-7sofDJR9UG4e6OEly1IJERLOUj9/vBtjyIvJ2Zkz6f4KgLP1SASGo0uAxCO9/1D5W2onzFJbdohkG+nPxL1QnA==", + "version": "3.0.0-rc12", + "resolved": "https://registry.npmjs.org/superdesk-ui-framework/-/superdesk-ui-framework-3.0.0-rc12.tgz", + "integrity": "sha512-fZqAr4PEDXJA2PP51EEWoUdOpx0QthY5pBeYJ+3vxTwu6HRj1ZYQYCEWnQAMCZ/h7C1mHTL7UYMkq9fvB5jHjw==", "requires": { "@material-ui/lab": "^4.0.0-alpha.56", "@popperjs/core": "^2.4.0", - "@superdesk/primereact": "^5.0.2-4", + "@superdesk/primereact": "^5.0.2-6", "@types/node": "^14.10.2", "chart.js": "^2.9.3", "date-fns": "2.7.0", + "moment": "^2.29.3", "popper.js": "1.14.4", "primeicons": "2.0.0", - "react-id-generator": "^3.0.2", - "react-popper": "^2.2.3" + "react-beautiful-dnd": "^13.0.0", + "react-id-generator": "^3.0.0", + "react-popper": "^2.2.3", + "react-scrollspy": "^3.4.3" }, "dependencies": { "@types/node": { "version": "14.18.36", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.36.tgz", "integrity": "sha512-FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ==" + }, + "moment": { + "version": "2.29.4", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", + "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==" } } }, @@ -12351,6 +12359,11 @@ "setimmediate": "^1.0.4" } }, + "tiny-invariant": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz", + "integrity": "sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==" + }, "tinycolor": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz", @@ -12926,6 +12939,11 @@ "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==" }, + "use-memo-one": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/use-memo-one/-/use-memo-one-1.1.3.tgz", + "integrity": "sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==" + }, "user-home": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz", diff --git a/client/package.json b/client/package.json index 968f61f6..accee259 100644 --- a/client/package.json +++ b/client/package.json @@ -2,9 +2,9 @@ "name": "superdesk", "license": "GPL-3.0", "dependencies": { - "superdesk-analytics": "github:superdesk/superdesk-analytics#v2.5.1", - "superdesk-core": "github:superdesk/superdesk-client-core#v2.5.2", - "superdesk-planning": "github:superdesk/superdesk-planning#v2.5.1" + "superdesk-analytics": "github:superdesk/superdesk-analytics#v2.6.0-rc1", + "superdesk-core": "github:superdesk/superdesk-client-core#v2.6.0", + "superdesk-planning": "github:superdesk/superdesk-planning#v2.6.0" }, "devDependencies": { "@superdesk/build-tools": "^1.0.18" diff --git a/server/requirements.in b/server/requirements.in index 6952ed80..e9a494b5 100644 --- a/server/requirements.in +++ b/server/requirements.in @@ -3,6 +3,6 @@ honcho gspread==3.1.0 oauth2client==4.1.3 -git+https://github.com/superdesk/superdesk-core.git@v2.5.2#egg=Superdesk-Core -git+https://github.com/superdesk/superdesk-analytics.git@v2.5.1#egg=superdesk-analytics -git+https://github.com/superdesk/superdesk-planning.git@v2.5.1#egg=superdesk-planning +git+https://github.com/superdesk/superdesk-core.git@v2.6.0#egg=Superdesk-Core +git+https://github.com/superdesk/superdesk-analytics.git@v2.6.0-rc1#egg=superdesk-analytics +git+https://github.com/superdesk/superdesk-planning.git@v2.6.0#egg=superdesk-planning diff --git a/server/requirements.txt b/server/requirements.txt index 3511538c..c965d467 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -104,7 +104,7 @@ gunicorn==20.1.0 # via -r requirements.in hachoir==3.0a3 # via superdesk-core -hermescache==0.7.2 +hermescache==0.10.0 # via superdesk-core honcho==1.1.0 # via -r requirements.in @@ -114,8 +114,6 @@ icalendar==4.0.9 # via superdesk-planning idna==3.4 # via requests -importlib-metadata==3.1.1 - # via superdesk-core itsdangerous==1.1.0 # via # flask @@ -158,7 +156,7 @@ oauth2client==4.1.3 # flask-oidc-ex oauthlib==3.2.2 # via requests-oauthlib -pillow==8.1.2 +pillow==9.2.0 # via superdesk-core pyasn1==0.4.8 # via @@ -231,11 +229,11 @@ six==1.16.0 # flask-oidc-ex # oauth2client # python-dateutil -superdesk-analytics @ git+https://github.com/superdesk/superdesk-analytics.git@v2.5.1 +superdesk-analytics @ git+https://github.com/superdesk/superdesk-analytics.git@v2.6.0-rc1 # via -r requirements.in -superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@v2.5.2 +superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@v2.6.0 # via -r requirements.in -superdesk-planning @ git+https://github.com/superdesk/superdesk-planning.git@v2.5.1 +superdesk-planning @ git+https://github.com/superdesk/superdesk-planning.git@v2.6.0 # via -r requirements.in typing-extensions==4.4.0 # via superdesk-core @@ -254,7 +252,7 @@ vine==1.3.0 # via # amqp # celery -websockets==6.0 +websockets==10.3 # via superdesk-core werkzeug==1.0.1 # via @@ -262,8 +260,6 @@ werkzeug==1.0.1 # superdesk-core wrapt==1.14.1 # via deprecated -zipp==3.11.0 - # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools