Skip to content

Commit

Permalink
Merge pull request #7465 from opencv/release-2.10.3
Browse files Browse the repository at this point in the history
Release v2.10.3
  • Loading branch information
cvat-bot[bot] authored Feb 9, 2024
2 parents d427822 + 73bf676 commit aecaba6
Show file tree
Hide file tree
Showing 85 changed files with 709 additions and 450 deletions.
14 changes: 11 additions & 3 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
/.git
/.env
/.vscode
/.github
/.husky
/share
/data
/media
/.env
/.vscode
/db.sqlite3
/keys
**/node_modules
/static
/serverless
/site
/helm-chart
/dev
/changelog.d
/cvat-cli
/profiles
2 changes: 1 addition & 1 deletion .github/workflows/bandit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
Linter:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- id: files
uses: tj-actions/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/black.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
Linter:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- id: files
uses: tj-actions/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
REPO: ${{ github.repository }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/cache@v3
id: server-cache-action
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ jobs:
Linter:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '16.x'

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
needs: search_cache
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}

Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}

Expand Down Expand Up @@ -189,7 +189,7 @@ jobs:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}

Expand Down Expand Up @@ -256,11 +256,11 @@ jobs:
'actions_projects_models', 'canvas3d_functionality', 'canvas3d_functionality_2',
'issues_prs', 'issues_prs2', 'features']
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '16.x'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hadolint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
Linter:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- id: files
uses: tj-actions/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/helm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
!startsWith(github.event.pull_request.title, '[Dependent]')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Start minikube
uses: medyagh/setup-minikube@latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/isort.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
Linter:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- id: files
uses: tj-actions/[email protected]
with:
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
needs: search_cache
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Verify version consistency
run: ./dev/update_version.py --verify-current
Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-python@v4
with:
Expand Down Expand Up @@ -206,7 +206,7 @@ jobs:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Download CVAT server image
uses: actions/download-artifact@v3
Expand Down Expand Up @@ -279,9 +279,9 @@ jobs:
'actions_projects_models', 'canvas3d_functionality', 'canvas3d_functionality_2',
'issues_prs', 'issues_prs2', 'features']
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '18.x'

Expand Down Expand Up @@ -385,7 +385,7 @@ jobs:
needs: [rest_api_testing, unit_testing, e2e_testing]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 0
Expand All @@ -409,7 +409,7 @@ jobs:
cp hugo_extended_0.83.0_Linux-64bit/hugo hugo/hugo-0.83
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '18.x'

Expand Down Expand Up @@ -439,7 +439,7 @@ jobs:
needs: [rest_api_testing, unit_testing, e2e_testing, generate_github_pages]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Download CVAT server images
uses: actions/download-artifact@v3
Expand Down Expand Up @@ -479,7 +479,7 @@ jobs:
runs-on: ubuntu-latest
needs: [unit_testing, e2e_testing, rest_api_testing]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Downloading coverage results
uses: actions/download-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
docker-images:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Build images
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pylint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
Linter:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- id: files
uses: tj-actions/[email protected]
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/remark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ jobs:
Linter:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '16.x'

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/schedule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
needs: search_cache
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Login to Docker Hub
uses: docker/login-action@v3
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-python@v4
with:
Expand Down Expand Up @@ -197,9 +197,9 @@ jobs:
'actions_projects_models', 'canvas3d_functionality', 'canvas3d_functionality_2',
'issues_prs', 'issues_prs2', 'features']
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '16.x'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/stylelint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ jobs:
Linter:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '16.x'
- id: files
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-yarn-lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
if: startsWith(github.event.pull_request.head.ref, 'snyk-')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '16.x'

Expand Down
34 changes: 34 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,40 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

<!-- scriv-insert-here -->

<a id='changelog-2.10.3'></a>
## \[2.10.3\] - 2024-02-09

### Changed

- The "message" field of the payload of send:exception events
no longer includes a trailing linebreak
(<https://github.com/opencv/cvat/pull/7407>)

- Annotation guide is opened automatically if not seen yet when the job is "new annotation"
(<https://github.com/opencv/cvat/pull/7410>)
- Annotation guide will be opened automatically if this is specified in a link `/tasks/<id>/jobs/<id>?openGuide`
(<https://github.com/opencv/cvat/pull/7410>)

- Reduced number of server requests, made by clients
(<https://github.com/opencv/cvat/pull/7446>)

- Server exception rest_framework.exceptions.NotAuthenticated is not logged by analytics anymore
(<https://github.com/opencv/cvat/pull/7457>)

### Fixed

- Prevented zombie processes from accumulating in the Kvrocks container
(<https://github.com/opencv/cvat/pull/7412>)

- Fix Redis exceptions crashing the `/api/server/health/` endpoint
(<https://github.com/opencv/cvat/pull/7417>)

- Unhandled exception "Cannot read properties of null (reading 'plot')"
(<https://github.com/opencv/cvat/pull/7422>)

- Unhandled exception "Cannot read properties of undefined (reading 'toLowerCase')"
(<https://github.com/opencv/cvat/pull/7421>)

<a id='changelog-2.10.2'></a>
## \[2.10.2\] - 2024-01-26

Expand Down
4 changes: 2 additions & 2 deletions cvat-canvas/src/typescript/canvasView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1107,7 +1107,7 @@ export class CanvasViewImpl implements CanvasView, Listener {
}

private onShiftKeyDown = (e: KeyboardEvent): void => {
if (!e.repeat && e.code.toLowerCase().includes('shift')) {
if (!e.repeat && (e.code || '').toLowerCase().includes('shift')) {
this.snapToAngleResize = consts.SNAP_TO_ANGLE_RESIZE_SHIFT;
if (this.activeElement) {
const shape = this.svgShapes[this.activeElement.clientID];
Expand All @@ -1126,7 +1126,7 @@ export class CanvasViewImpl implements CanvasView, Listener {
};

private onShiftKeyUp = (e: KeyboardEvent): void => {
if (e.code.toLowerCase().includes('shift') && this.activeElement) {
if ((e.code || '').toLowerCase().includes('shift') && this.activeElement) {
this.snapToAngleResize = consts.SNAP_TO_ANGLE_RESIZE_DEFAULT;
if (this.activeElement) {
const shape = this.svgShapes[this.activeElement.clientID];
Expand Down
9 changes: 7 additions & 2 deletions cvat-canvas/src/typescript/sliceHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -448,8 +448,13 @@ export class SliceHandlerImpl implements SliceHandler {
return;
}

points.push([x, y]);
this.slicingLine.plot(stringifyPoints(points.flat()));
if (this.enabled) {
// check if slicing is still enabled
// because click() may finish slicing from inside
// e.g. when click out of contour with enabled shift
points.push([x, y]);
this.slicingLine.plot(stringifyPoints(points.flat()));
}
}
};

Expand Down
2 changes: 1 addition & 1 deletion cvat-cli/requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
cvat-sdk~=2.10.2
cvat-sdk~=2.10.3
Pillow>=10.1.0
setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability
2 changes: 1 addition & 1 deletion cvat-cli/requirements/development.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-r base.txt

black>=22.1.0
black>=24.1
isort>=5.10.1
pylint>=2.7.0
2 changes: 1 addition & 1 deletion cvat-cli/src/cvat_cli/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION = "2.10.2"
VERSION = "2.10.3"
2 changes: 1 addition & 1 deletion cvat-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cvat-core",
"version": "14.1.0",
"version": "14.1.1",
"type": "module",
"description": "Part of Computer Vision Tool which presents an interface for client-side integration",
"main": "src/api.ts",
Expand Down
Loading

0 comments on commit aecaba6

Please sign in to comment.