Merge branch 'develop' into release-1.6.0

main
Nikita Manovich 5 years ago
commit d8fd389c41

@ -5,7 +5,7 @@
"version": "0.2.0", "version": "0.2.0",
"configurations": [ "configurations": [
{ {
"type": "chrome", "type": "pwa-chrome",
"request": "launch", "request": "launch",
"preLaunchTask": "npm: start - cvat-ui", "preLaunchTask": "npm: start - cvat-ui",
"name": "ui.js: debug", "name": "ui.js: debug",
@ -59,7 +59,7 @@
}, },
{ {
"name": "server: chrome", "name": "server: chrome",
"type": "chrome", "type": "pwa-chrome",
"request": "launch", "request": "launch",
"url": "http://localhost:7000/", "url": "http://localhost:7000/",
"disableNetworkCache":true, "disableNetworkCache":true,

@ -6,7 +6,7 @@ django-cacheops==5.0.1
django-compressor==2.4 django-compressor==2.4
django-rq==2.3.2 django-rq==2.3.2
EasyProcess==0.3 EasyProcess==0.3
Pillow==8.3.0 Pillow==8.3.2
numpy==1.19.5 numpy==1.19.5
python-ldap==3.3.1 python-ldap==3.3.1
pytz==2020.1 pytz==2020.1
@ -14,7 +14,7 @@ pyunpack==0.2.1
rcssmin==1.0.6 rcssmin==1.0.6
redis==3.5.3 redis==3.5.3
rjsmin==1.1.0 rjsmin==1.1.0
requests==2.24.0 requests==2.26.0
rq==1.5.1 rq==1.5.1
rq-scheduler==0.10.0 rq-scheduler==0.10.0
sqlparse==0.3.1 sqlparse==0.3.1
@ -54,3 +54,4 @@ google-cloud-storage==1.42.0
# of pycocotools and tensorflow 2.4.1 # of pycocotools and tensorflow 2.4.1
# when pycocotools is installed by wheel in python 3.8+ # when pycocotools is installed by wheel in python 3.8+
datumaro==0.1.10.1 --no-binary=datumaro --no-binary=pycocotools datumaro==0.1.10.1 --no-binary=datumaro --no-binary=pycocotools
urllib3>=1.26.5 # not directly required, pinned by Snyk to avoid a vulnerability

Loading…
Cancel
Save