Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Align server api, sdk and cli versions to 2.1.0 #4913

Merged
merged 5 commits into from
Sep 6, 2022
Merged

Align server api, sdk and cli versions to 2.1.0 #4913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fae6064
Align cli version with sdk
zhiltsov-max Sep 5, 2022
559c922
Bump and align server api, sdk and cli versions
zhiltsov-max Sep 6, 2022
8ede589
Fix sdk build
zhiltsov-max Sep 6, 2022
0c44495
Bump cli version
zhiltsov-max Sep 6, 2022
4d4a90b
Remove generated MANIFEST.in file
zhiltsov-max Sep 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cvat-cli/requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
cvat-sdk==2.0a1.*
cvat-sdk==2.1.0
Pillow>=6.2.0
2 changes: 1 addition & 1 deletion cvat-cli/src/cvat_cli/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION = "2.0a1"
VERSION = "2.1.0"
1 change: 1 addition & 0 deletions cvat-sdk/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,4 @@ requirements/
docs/
setup.py
README.md
MANIFEST.in
2 changes: 0 additions & 2 deletions cvat-sdk/MANIFEST.in
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cvat-sdk/gen/generate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set -e

GENERATOR_VERSION="v6.0.1"

VERSION="2.0a1"
VERSION="2.1.0"
LIB_NAME="cvat_sdk"
LAYER1_LIB_NAME="${LIB_NAME}/api_client"
DST_DIR="."
Expand Down
1 change: 1 addition & 0 deletions cvat-sdk/gen/templates/MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
include README.md
include requirements/api_client.txt
include requirements/base.txt
3 changes: 1 addition & 2 deletions cvat/settings/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ def add_ssh_keys():
# Statically set schema version. May also be an empty string. When used together with
# view versioning, will become '0.0.0 (v2)' for 'v2' versioned requests.
# Set VERSION to None if only the request version should be rendered.
'VERSION': 'alpha (2.0)',
'VERSION': '2.1.0',
'CONTACT': {
'name': 'CVAT.ai team',
'url': 'https://github.com/cvat-ai/cvat',
Expand Down Expand Up @@ -567,4 +567,3 @@ def add_ssh_keys():
'SCHEMA_PATH_PREFIX': '/api',
'SCHEMA_PATH_PREFIX_TRIM': False,
}

2 changes: 1 addition & 1 deletion tests/python/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cvat-sdk==2.0a1.*
cvat-sdk==2.1.0
pytest==6.2.5
requests==2.26.0
deepdiff==5.6.0
Expand Down