Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/openvinotoolkit/cvat int…
Browse files Browse the repository at this point in the history
…o dkru/fix-tests-migrating-antd
  • Loading branch information
dvkruchinin committed Sep 7, 2021
2 parents 821bce4 + c60e8aa commit 0774e21
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 28 deletions.
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"version": "0.2.0",
"configurations": [
{
"type": "chrome",
"type": "pwa-chrome",
"request": "launch",
"preLaunchTask": "npm: start - cvat-ui",
"name": "ui.js: debug",
Expand Down Expand Up @@ -59,7 +59,7 @@
},
{
"name": "server: chrome",
"type": "chrome",
"type": "pwa-chrome",
"request": "launch",
"url": "http://localhost:7000/",
"disableNetworkCache":true,
Expand Down
14 changes: 7 additions & 7 deletions cvat-core/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cvat-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"webpack-cli": "^3.3.2"
},
"dependencies": {
"axios": "^0.21.1",
"axios": "^0.21.3",
"browser-or-node": "^1.2.1",
"cvat-data": "../cvat-data",
"detect-browser": "^5.2.0",
Expand Down
30 changes: 15 additions & 15 deletions cvat-ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cvat-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"worker-loader": "^2.0.0"
},
"dependencies": {
"@ant-design/icons": "^4.6.2",
"@ant-design/icons": "^4.6.3",
"@types/lodash": "^4.14.172",
"@types/platform": "^1.3.4",
"@types/react": "^17.0.18",
Expand Down
5 changes: 3 additions & 2 deletions cvat/requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ django-cacheops==5.0.1
django-compressor==2.4
django-rq==2.3.2
EasyProcess==0.3
Pillow==8.3.0
Pillow==8.3.2
numpy==1.19.5
python-ldap==3.3.1
pytz==2020.1
pyunpack==0.2.1
rcssmin==1.0.6
redis==3.5.3
rjsmin==1.1.0
requests==2.24.0
requests==2.26.0
rq==1.5.1
rq-scheduler==0.10.0
sqlparse==0.3.1
Expand Down Expand Up @@ -54,3 +54,4 @@ google-cloud-storage==1.42.0
# of pycocotools and tensorflow 2.4.1
# when pycocotools is installed by wheel in python 3.8+
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
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,13 @@ description: 'Information about the installation of components needed for semi-a
- See [deploy_gpu.sh](https://github.com/openvinotoolkit/cvat/blob/develop/serverless/deploy_gpu.sh)
script for more examples.

**Note for Windows users:**

If you want to use nuclio under Windows CVAT installation you should install Nvidia drivers for WSL according to
[this](https://docs.nvidia.com/cuda/wsl-user-guide/index.html) instruction and follow the steps up to “2.3 Installing Nvidia drivers”.
Important requirement: you should have the latest versions of Docker Desktop, Nvidia drivers for WSL,
and the latest updates from the Windows Insider Preview Dev channel.

**Troubleshooting Nuclio Functions:**

- You can open nuclio dashboard at [localhost:8070](http://localhost:8070).
Expand Down

0 comments on commit 0774e21

Please sign in to comment.