From d049d7a61f6387722dd729d00f8070c346280525 Mon Sep 17 00:00:00 2001 From: wh1te909 Date: Wed, 14 Jul 2021 07:36:55 +0000 Subject: [PATCH] update reqs --- api/tacticalrmm/requirements.txt | 22 +++++------ api/tacticalrmm/tacticalrmm/settings.py | 6 +-- web/package-lock.json | 50 ++++++++----------------- web/package.json | 4 +- 4 files changed, 32 insertions(+), 50 deletions(-) diff --git a/api/tacticalrmm/requirements.txt b/api/tacticalrmm/requirements.txt index 5bbb65a0..1ea639a3 100644 --- a/api/tacticalrmm/requirements.txt +++ b/api/tacticalrmm/requirements.txt @@ -1,21 +1,21 @@ -asgiref==3.3.4 +asgiref==3.4.1 asyncio-nats-client==0.11.4 -celery==5.1.1 +celery==5.1.2 certifi==2021.5.30 -cffi==1.14.5 -channels==3.0.3 -channels_redis==3.2.0 +cffi==1.14.6 +channels==3.0.4 +channels_redis==3.3.0 chardet==4.0.0 cryptography==3.4.7 daphne==3.0.2 -Django==3.2.4 +Django==3.2.5 django-cors-headers==3.7.0 django-rest-knox==4.1.0 djangorestframework==3.12.4 future==0.18.2 loguru==0.5.3 msgpack==1.0.2 -packaging==20.9 +packaging==21.0 psycopg2-binary==2.9.1 pycparser==2.20 pycryptodome==3.10.1 @@ -24,13 +24,13 @@ pyparsing==2.4.7 pytz==2021.1 qrcode==6.1 redis==3.5.3 -requests==2.25.1 +requests==2.26.0 six==1.16.0 sqlparse==0.4.1 -twilio==6.60.0 -urllib3==1.26.5 +twilio==6.61.0 +urllib3==1.26.6 uWSGI==2.0.19.1 validators==0.18.2 vine==5.0.0 websockets==9.1 -zipp==3.4.1 +zipp==3.5.0 diff --git a/api/tacticalrmm/tacticalrmm/settings.py b/api/tacticalrmm/tacticalrmm/settings.py index 9b9f15e6..d19d100f 100644 --- a/api/tacticalrmm/tacticalrmm/settings.py +++ b/api/tacticalrmm/tacticalrmm/settings.py @@ -27,10 +27,10 @@ LATEST_AGENT_VER = "1.5.9" MESH_VER = "0.8.60" # for the update script, bump when need to recreate venv or npm install -PIP_VER = "19" -NPM_VER = "19" +PIP_VER = "20" +NPM_VER = "20" -SETUPTOOLS_VER = "57.0.0" +SETUPTOOLS_VER = "57.1.0" WHEEL_VER = "0.36.2" DL_64 = f"https://github.com/wh1te909/rmmagent/releases/download/v{LATEST_AGENT_VER}/winagent-v{LATEST_AGENT_VER}.exe" diff --git a/web/package-lock.json b/web/package-lock.json index a789420e..976bfc1a 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -13,13 +13,13 @@ "dotenv": "^8.6.0", "prismjs": "^1.23.0", "qrcode.vue": "^3.2.2", - "quasar": "^2.0.1", + "quasar": "^2.0.2", "vue-prism-editor": "^2.0.0-alpha.2", "vue3-apexcharts": "^1.4.0", "vuex": "^4.0.2" }, "devDependencies": { - "@quasar/app": "^3.0.1", + "@quasar/app": "^3.0.2", "@quasar/cli": "^1.2.1" } }, @@ -1891,9 +1891,9 @@ } }, "node_modules/@quasar/app": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@quasar/app/-/app-3.0.1.tgz", - "integrity": "sha512-a1hm4miFkvc9setIqtVAKyILHhJ0ZD+Xw52gtGgwwSNGQfKL6UY04837bkjzVOXQ1ybcd5Kpjv3kWPhdTL3TZA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@quasar/app/-/app-3.0.2.tgz", + "integrity": "sha512-4qFW3mzoW64ob2zipmcVvQhy5XMgZrgLYhwPyjN/i2agXbdgZuzNMXSqgXduoXrCJ/6a2dYPTR4i7xHESb+WXg==", "dev": true, "dependencies": { "@quasar/babel-preset-app": "2.0.1", @@ -1966,8 +1966,7 @@ "webpack-chain": "6.5.1", "webpack-dev-server": "4.0.0-beta.3", "webpack-merge": "5.8.0", - "webpack-node-externals": "3.0.0", - "zlib": "1.0.5" + "webpack-node-externals": "3.0.0" }, "bin": { "quasar": "bin/quasar" @@ -10422,9 +10421,9 @@ } }, "node_modules/quasar": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/quasar/-/quasar-2.0.1.tgz", - "integrity": "sha512-DDxcuEardFvebCTNeGeneS/3NazY9ZqNPII9o2VC/ujZn7/hIWDsB0ajYJG8l/pV8kkiaiaIBaE93EzoXfEXrA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/quasar/-/quasar-2.0.2.tgz", + "integrity": "sha512-Z5ghL4LA8YxkM8HBqmzn3o4HOIbFEgWcwvWRbIcRbNX/NjchyeV7YlgzHyIdOClnAHrJ0szZSItl/2n86k43aw==", "engines": { "node": ">= 10.18.1", "npm": ">= 6.13.4", @@ -13351,16 +13350,6 @@ "engines": { "node": ">= 10" } - }, - "node_modules/zlib": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/zlib/-/zlib-1.0.5.tgz", - "integrity": "sha1-bnyXL8NxxkWmr7A6sUdp3vEU/MA=", - "dev": true, - "hasInstallScript": true, - "engines": { - "node": ">=0.2.0" - } } }, "dependencies": { @@ -14682,9 +14671,9 @@ "dev": true }, "@quasar/app": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@quasar/app/-/app-3.0.1.tgz", - "integrity": "sha512-a1hm4miFkvc9setIqtVAKyILHhJ0ZD+Xw52gtGgwwSNGQfKL6UY04837bkjzVOXQ1ybcd5Kpjv3kWPhdTL3TZA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@quasar/app/-/app-3.0.2.tgz", + "integrity": "sha512-4qFW3mzoW64ob2zipmcVvQhy5XMgZrgLYhwPyjN/i2agXbdgZuzNMXSqgXduoXrCJ/6a2dYPTR4i7xHESb+WXg==", "dev": true, "requires": { "@quasar/babel-preset-app": "2.0.1", @@ -14757,8 +14746,7 @@ "webpack-chain": "6.5.1", "webpack-dev-server": "4.0.0-beta.3", "webpack-merge": "5.8.0", - "webpack-node-externals": "3.0.0", - "zlib": "1.0.5" + "webpack-node-externals": "3.0.0" } }, "@quasar/babel-preset-app": { @@ -21360,9 +21348,9 @@ "dev": true }, "quasar": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/quasar/-/quasar-2.0.1.tgz", - "integrity": "sha512-DDxcuEardFvebCTNeGeneS/3NazY9ZqNPII9o2VC/ujZn7/hIWDsB0ajYJG8l/pV8kkiaiaIBaE93EzoXfEXrA==" + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/quasar/-/quasar-2.0.2.tgz", + "integrity": "sha512-Z5ghL4LA8YxkM8HBqmzn3o4HOIbFEgWcwvWRbIcRbNX/NjchyeV7YlgzHyIdOClnAHrJ0szZSItl/2n86k43aw==" }, "query-string": { "version": "5.1.1", @@ -23611,12 +23599,6 @@ "compress-commons": "^4.1.0", "readable-stream": "^3.6.0" } - }, - "zlib": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/zlib/-/zlib-1.0.5.tgz", - "integrity": "sha1-bnyXL8NxxkWmr7A6sUdp3vEU/MA=", - "dev": true } } } diff --git a/web/package.json b/web/package.json index 8c2476b2..6f10057f 100644 --- a/web/package.json +++ b/web/package.json @@ -16,13 +16,13 @@ "dotenv": "^8.6.0", "prismjs": "^1.23.0", "qrcode.vue": "^3.2.2", - "quasar": "^2.0.1", + "quasar": "^2.0.2", "vue-prism-editor": "^2.0.0-alpha.2", "vue3-apexcharts": "^1.4.0", "vuex": "^4.0.2" }, "devDependencies": { - "@quasar/app": "^3.0.1", + "@quasar/app": "^3.0.2", "@quasar/cli": "^1.2.1" }, "browserslist": [