update reqs

.gitignore

@@ -26,3 +26,4 @@ api/tacticalrmm/static
 celerybeat-schedule
 meshagent.exe
 app.ini
+.env.dev

.travis.yml

@@ -66,7 +66,7 @@ matrix:
 
       install:
         - pip install --upgrade pip
-        - pip install -r requirements-test.txt
+        - pip install -r requirements.txt -r requirements-test.txt
 
       script:
         - python manage.py test -v 2
@@ -87,7 +87,7 @@ matrix:
 
       install:
         - pip install --upgrade pip
-        - pip install -r requirements-test.txt
+        - pip install -r requirements.txt -r requirements-test.txt
 
       script:
         - python manage.py test -v 2

api/tacticalrmm/requirements-dev.txt

@@ -0,0 +1,8 @@
+appdirs==1.4.3
+attrs==19.3.0
+black==19.10b0
+Click==7.0
+pathspec==0.7.0
+regex==2020.1.8
+toml==0.10.0
+typed-ast==1.4.1

api/tacticalrmm/requirements-test.txt

@@ -1,43 +1 @@
-amqp==2.5.2
-appdirs==1.4.3
-asgiref==3.2.3
-attrs==19.3.0
-billiard==3.6.1.0
-black==19.10b0
-celery==4.4.0
-certifi==2019.11.28
-cffi==1.13.2
-chardet==3.0.4
-Click==7.0
-cryptography==2.8
-decorator==4.4.1
-distro==1.4.0
-Django==3.0.2
-django-cors-headers==3.2.1
-django-rest-knox==4.1.0
-djangorestframework==3.11.0
-idna==2.8
-importlib-metadata==1.3.0
-kombu==4.6.7
-loguru==0.4.0
 mock==3.0.5
-more-itertools==8.0.2
-packaging==19.2
-pathspec==0.7.0
-psycopg2-binary==2.8.4
-pycparser==2.19
-pyotp==2.3.0
-pyparsing==2.4.6
-pytz==2019.3
-redis==3.3.11
-regex==2019.12.20
-requests==2.22.0
-six==1.13.0
-sqlparse==0.3.0
-toml==0.10.0
-typed-ast==1.4.0
-urllib3==1.25.7
-uWSGI==2.0.18
-validators==0.14.1
-vine==1.3.0
-zipp==0.6.0

api/tacticalrmm/requirements.txt

@@ -1,14 +1,10 @@
 amqp==2.5.2
-appdirs==1.4.3
 asgiref==3.2.3
-attrs==19.3.0
 billiard==3.6.1.0
-black==19.10b0
 celery==4.4.0
 certifi==2019.11.28
 cffi==1.13.2
 chardet==3.0.4
-Click==7.0
 cryptography==2.8
 decorator==4.4.1
 distro==1.4.0
@@ -17,26 +13,20 @@ django-cors-headers==3.2.1
 django-rest-knox==4.1.0
 djangorestframework==3.11.0
 idna==2.8
-importlib-metadata==1.3.0
+importlib-metadata==1.4.0
 kombu==4.6.7
 loguru==0.4.0
-more-itertools==8.0.2
-packaging==19.2
-pathspec==0.7.0
+more-itertools==8.1.0
 psycopg2-binary==2.8.4
 pycparser==2.19
 pyotp==2.3.0
-pyparsing==2.4.6
 pytz==2019.3
 redis==3.3.11
-regex==2019.12.20
 requests==2.22.0
-six==1.13.0
+six==1.14.0
 sqlparse==0.3.0
-toml==0.10.0
-typed-ast==1.4.0
 urllib3==1.25.7
 uWSGI==2.0.18
 validators==0.14.1
 vine==1.3.0
-zipp==0.6.0
+zipp==1.0.0a

azure-pipelines.yml

@@ -29,7 +29,7 @@ jobs:
       python --version
       cd /home/steam/myagent/_work/1/s/api/tacticalrmm
       pip install --upgrade pip
-      pip install -r requirements-test.txt
+      pip install -r requirements.txt -r requirements-test.txt
       python manage.py test -v 2
       deactivate
     displayName: 'Install Dependencies and Run Tests'

web/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "web",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -971,9 +971,9 @@
       "dev": true
     },
     "@quasar/extras": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.4.0.tgz",
-      "integrity": "sha512-ouhk4dWkPYWCjBZU+xN9/55O3Bszn1MDpFSFCtcGQXVe6VrmIvE/wE09YD+cp4PZdzsQZZiiTftziyoCzdy2Qg=="
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.4.2.tgz",
+      "integrity": "sha512-lq2h18+IUs8M6weWRVoqzsPluENsBRdb4t2ePbsX0mjYz50Xpk1/K9isUotl7bDQDkJSwbshQKLOD7P1co0fTg=="
     },
     "@soda/friendly-errors-webpack-plugin": {
       "version": "1.7.1",
@@ -8457,9 +8457,9 @@
       "dev": true
     },
     "quasar": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/quasar/-/quasar-1.7.0.tgz",
-      "integrity": "sha512-xZ11IEhWzcLfvzeNaz4atZ1TrF4X4Zydw1GbF3U/kPMs3FNzdWRop375VHeau2yXkpKIttWYTb5zcGf1tvGV5A=="
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/quasar/-/quasar-1.7.4.tgz",
+      "integrity": "sha512-gAp/q5Bn1lbBsKi7lZHZVNw/VI3EvUm5KwdRx7+O44RBb0i0P3oBib8HjpSzfQGaqdPogJFd7nQ/Az+jAfMYEA=="
     },
     "query-string": {
       "version": "4.3.4",

web/package.json

@@ -7,10 +7,10 @@
     "build": "vue-cli-service build"
   },
   "dependencies": {
-    "@quasar/extras": "^1.4.0",
+    "@quasar/extras": "^1.4.2",
     "axios": "^0.19.0",
     "core-js": "^3.4.5",
-    "quasar": "^1.7.0",
+    "quasar": "^1.7.4",
     "vue": "^2.6.11",
     "vue-router": "^3.1.3",
     "vuex": "^3.1.2"