Skip to content

Commit

Permalink
Renamed cvatjs to cvat-core (cvat-ai#590)
Browse files Browse the repository at this point in the history
* cvatjs => cvat-core

* Updated version

* Fixed docker directories
  • Loading branch information
bsekachev authored and nmanovic committed Jul 25, 2019
1 parent 8a00211 commit ebbcb83
Show file tree
Hide file tree
Showing 38 changed files with 19 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ before_script:

script:
- docker exec -it cvat /bin/bash -c 'python3 manage.py test cvat/apps/engine'
- docker exec -it cvat /bin/bash -c 'cd cvatjs && npm install && npm run test && npm run coveralls'
- docker exec -it cvat /bin/bash -c 'cd cvat-core && npm install && npm run test && npm run coveralls'
6 changes: 3 additions & 3 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
"name": "cvat.js debug",
"type": "node",
"request": "launch",
"cwd": "${workspaceFolder}/cvatjs",
"cwd": "${workspaceFolder}/cvat-core",
"runtimeExecutable": "node",
"runtimeArgs": [
"--nolazy",
Expand All @@ -135,10 +135,10 @@
"type": "node",
"request": "launch",
"name": "jest debug",
"program": "${workspaceFolder}/cvatjs/node_modules/.bin/jest",
"program": "${workspaceFolder}/cvat-core/node_modules/.bin/jest",
"args": [
"--config",
"${workspaceFolder}/cvatjs/jest.config.js"
"${workspaceFolder}/cvat-core/jest.config.js"
],
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen",
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ RUN if [ "$WITH_DEXTR" = "yes" ]; then \

COPY ssh ${HOME}/.ssh
COPY cvat/ ${HOME}/cvat
COPY cvatjs/ ${HOME}/cvatjs
COPY cvat-core/ ${HOME}/cvat-core
COPY tests ${HOME}/tests
# Binary option is necessary to correctly apply the patch on Windows platform.
# https://unix.stackexchange.com/questions/239364/how-to-fix-hunk-1-failed-at-1-different-line-endings-message
Expand Down
File renamed without changes.
4 changes: 4 additions & 0 deletions cvat-core/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
docs
node_modules
reports
package-lock.json
17 changes: 9 additions & 8 deletions cvatjs/README.md → cvat-core/README.md
Original file line number Diff line number Diff line change
@@ -1,32 +1,33 @@
# Computer Vision Annotation Tool (JS)
# Module CVAT-CORE

## Description
This CVAT module has been created in order to easy integration process with CVAT.
This CVAT module is a clien-side JavaScipt library to management of objects, frames, logs, etc.
It contains the core logic of the Computer Vision Annotation Tool.

### Short development manual
### Commands

- Install dependencies
- Dependencies installation
```bash
npm install
```

- Build library from sources in ```dist``` directory:
- Building the module from sources in the ```dist``` directory:
```bash
npm run-script build
npm run build -- --mode=development # without a minification
```

- Build documentation in ```docs``` directory:
- Building the documentation in the ```docs``` directory:
```bash
npm run-script docs
```

- Run tests:
- Running of tests:
```bash
npm run-script test
```

- Update version of library:
- Updating of a module version:
```bash
npm version patch # updated after minor fixes
npm version minor # updated after major changes which don't affect API compatibility with previous versions
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion cvatjs/package.json → cvat-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cvat.js",
"version": "1.0.0",
"version": "0.1.0",
"description": "Part of Computer Vision Tool which presents an interface for client-side integration",
"main": "babel.config.js",
"scripts": {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit ebbcb83

Please sign in to comment.