From 39eb9c535bbc5f61d0ce2f8c8fa26509fa98a34d Mon Sep 17 00:00:00 2001 From: Nikita Manovich <40690625+nmanovic@users.noreply.github.com> Date: Mon, 6 Apr 2020 15:58:55 +0300 Subject: [PATCH 1/4] Add pull request and issue templates (#1359) * Add initial version of pull request template * Fix links * Fix codacy issues * Slightly improve titles of sections * Add a note about strikethough for the checklist. * Fix progress of a pull request (each checkbox is an issue) * Add the license header, checkboxes about the license. * Updated the license * Update the license to met https://github.com/licensee/licensee/blob/master/vendor/choosealicense.com/_licenses/mit.txt restrictions. * Fix the pull request template name * Make explaination text as comments (it will be visible when you edit the PR message) * Add initial version of the issue template. --- .github/ISSUE_TEMPLATE.md | 53 ++++++++++++++++++++++++++++++++ .github/PULL_REQUEST_TEMPLATE.md | 46 +++++++++++++++++++++++++++ LICENSE | 5 +-- 3 files changed, 102 insertions(+), 2 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 000000000000..d9506af88420 --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,53 @@ + + +### My actions before raising this issue +- [ ] Read/searched [the docs](https://github.com/opencv/cvat/tree/master#documentation) +- [ ] Searched [past issues](/issues) + + + +### Expected Behaviour + + +### Current Behaviour + + +### Possible Solution + + +### Steps to Reproduce (for bugs) + +1. +1. +1. +1. + +### Context + + +### Your Environment + +- Git hash commit (`git log -1`): +- Docker version `docker version` (e.g. Docker 17.0.05): +- Are you using Docker Swarm or Kubernetes? +- Operating System and version (e.g. Linux, Windows, MacOS): +- Code example or link to GitHub repo or gist to reproduce problem: +- Other diagnostic information / logs: +
+ Logs from `cvat` container +
+ +### Next steps +You may [join our Gitter](https://gitter.im/opencv-cvat/public) channel for community support. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 000000000000..23b9bde82ca7 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,46 @@ + + + + +### Motivation and context + + +### How has this been tested? + + +### Checklist + + +- [ ] I have raised an issue to propose this change ([required](https://github.com/opencv/cvat/issues)) +- [ ] My issue has received approval from the maintainers +- [ ] I've read the [CONTRIBUTION](https://github.com/opencv/cvat/blob/develop/CONTRIBUTING.md) guide +- [ ] I have added description of my changes into [CHANGELOG](https://github.com/opencv/cvat/blob/develop/CHANGELOG.md) file +- [ ] I have updated the [documentation]( + https://github.com/opencv/cvat/blob/develop/README.md#documentation) accordingly +- [ ] I have added tests to cover my changes +- [ ] I have linked related issues ([read github docs]( + https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword)) + +### License + +- [ ] I submit _my code changes_ under the same [MIT License]( + https://github.com/opencv/cvat/blob/develop/LICENSE) that covers the project. + Feel free to contact the maintainers if that's a concern. +- [ ] I have updated the license header for each file (see an example below) + +```python +# Copyright (C) 2020 Intel Corporation +# +# SPDX-License-Identifier: MIT +``` diff --git a/LICENSE b/LICENSE index aae0a08ec7db..46056e4fd379 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,6 @@ -Copyright (C) 2018 Intel Corporation +MIT License + +Copyright (C) 2018-2020 Intel Corporation   Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -18,4 +20,3 @@ OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.   -SPDX-License-Identifier: MIT From 034268e87dbf72b6ca08f017152b962882cc1d84 Mon Sep 17 00:00:00 2001 From: Nikita Manovich <40690625+nmanovic@users.noreply.github.com> Date: Mon, 20 Apr 2020 10:47:36 +0300 Subject: [PATCH 2/4] Improve PR template (#1427) * Simplified PR template. * Remove a new line to make codacy happy. --- .github/PULL_REQUEST_TEMPLATE.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 23b9bde82ca7..f07c5f8cc3c6 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -4,6 +4,12 @@ Copyright (C) 2020 Intel Corporation SPDX-License-Identifier: MIT --> + + ### Motivation and context @@ -21,10 +27,7 @@ see how your change affects other areas of the code, etc. --> If an item isn't applicable by a reason then ~~explicitly strikethrough~~ the whole line. If you don't do that github will show incorrect process for the pull request. If you're unsure about any of these, don't hesitate to ask. We're here to help! --> - -- [ ] I have raised an issue to propose this change ([required](https://github.com/opencv/cvat/issues)) -- [ ] My issue has received approval from the maintainers -- [ ] I've read the [CONTRIBUTION](https://github.com/opencv/cvat/blob/develop/CONTRIBUTING.md) guide +- [ ] I submit my changes into the `develop` branch - [ ] I have added description of my changes into [CHANGELOG](https://github.com/opencv/cvat/blob/develop/CHANGELOG.md) file - [ ] I have updated the [documentation]( https://github.com/opencv/cvat/blob/develop/README.md#documentation) accordingly From ebd6e11289bef412eadf3879310f275ec3a3b760 Mon Sep 17 00:00:00 2001 From: Nikita Manovich Date: Fri, 29 May 2020 17:53:22 +0300 Subject: [PATCH 3/4] Slightly improve changelog --- CHANGELOG.md | 58 +++++++++++++++++++++++----------------------------- 1 file changed, 26 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37ca35f2d90d..600c9676b2e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,42 +4,39 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [1.0.0] - Unreleased +## [1.0.0] - 2020-05-29 ### Added -- cvat-ui: added cookie policy drawer for login page () -- Added `datumaro_project` export format (https://github.com/opencv/cvat/pull/1352) -- Ability to configure user agreements for the user registration form (https://github.com/opencv/cvat/pull/1464) -- Added cuboid interpolation and cuboid drawing from rectangles () -- Ability to configure custom pageViewHit, which can be useful for web analytics integration (https://github.com/opencv/cvat/pull/1566) -- Ability to configure access to the analytics page based on roles (https://github.com/opencv/cvat/pull/1592) +- cvat-ui: cookie policy drawer for login page () +- `datumaro_project` export format () +- Ability to configure user agreements for the user registration form () +- Cuboid interpolation and cuboid drawing from rectangles () +- Ability to configure custom pageViewHit, which can be useful for web analytics integration () +- Ability to configure access to the analytics page based on roles () ### Changed -- Downloaded file name in annotations export became more informative (https://github.com/opencv/cvat/pull/1352) -- Added auto trimming for trailing whitespaces style enforcement (https://github.com/opencv/cvat/pull/1352) -- REST API: updated `GET /task//annotations`: parameters are `format`, `filename` (now optional), `action` (optional) (https://github.com/opencv/cvat/pull/1352) -- REST API: removed `dataset/formats`, changed format of `annotation/formats` (https://github.com/opencv/cvat/pull/1352) -- Exported annotations are stored for N hours instead of indefinitely (https://github.com/opencv/cvat/pull/1352) -- Formats: CVAT format now accepts ZIP and XML (https://github.com/opencv/cvat/pull/1352) -- Formats: COCO format now accepts ZIP and JSON (https://github.com/opencv/cvat/pull/1352) -- Formats: most of formats renamed, no extension in title (https://github.com/opencv/cvat/pull/1352) -- Formats: definitions are changed, are not stored in DB anymore (https://github.com/opencv/cvat/pull/1352) -- cvat-core: session.annotations.put() now returns identificators of added objects (https://github.com/opencv/cvat/pull/1493) -- Images without annotations now also included in dataset/annotations export (https://github.com/opencv/cvat/issues/525) - -### Deprecated -- +- Downloaded file name in annotations export became more informative () +- Added auto trimming for trailing whitespaces style enforcement () +- REST API: updated `GET /task//annotations`: parameters are `format`, `filename` (now optional), `action` (optional) () +- REST API: removed `dataset/formats`, changed format of `annotation/formats` () +- Exported annotations are stored for N hours instead of indefinitely () +- Formats: CVAT format now accepts ZIP and XML () +- Formats: COCO format now accepts ZIP and JSON () +- Formats: most of formats renamed, no extension in title () +- Formats: definitions are changed, are not stored in DB anymore () +- cvat-core: session.annotations.put() now returns ids of added objects () +- Images without annotations now also included in dataset/annotations export () ### Removed -- `annotation` application is replaced with `dataset_manager` (https://github.com/opencv/cvat/pull/1352) -- `_DATUMARO_INIT_LOGLEVEL` env. variable is removed in favor of regular `--loglevel` cli parameter (https://github.com/opencv/cvat/pull/1583) +- `annotation` application is replaced with `dataset_manager` () +- `_DATUMARO_INIT_LOGLEVEL` env. variable is removed in favor of regular `--loglevel` cli parameter () ### Fixed -- Categories for empty projects with no sources are taken from own dataset (https://github.com/opencv/cvat/pull/1352) -- Added directory removal on error during `extract` command (https://github.com/opencv/cvat/pull/1352) -- Added debug error message on incorrect XPath (https://github.com/opencv/cvat/pull/1352) -- Exporting frame stepped task (https://github.com/opencv/cvat/issues/1294, https://github.com/opencv/cvat/issues/1334) -- Fixed broken command line interface for `cvat` export format in Datumaro (https://github.com/opencv/cvat/issues/1494) -- Updated Rest API document, Swagger document serving instruction issue (https://github.com/opencv/cvat/issues/1495) +- Categories for empty projects with no sources are taken from own dataset () +- Added directory removal on error during `extract` command () +- Added debug error message on incorrect XPath () +- Exporting frame stepped task () +- Fixed broken command line interface for `cvat` export format in Datumaro () +- Updated Rest API document, Swagger document serving instruction issue () - Fixed cuboid occluded view () - Non-informative lock icon () - Sidebar in AAM has no hide/show button () @@ -59,9 +56,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed an issue with `z_order` having no effect on segmentations () - Permission group whitelist check for analytics view () -### Security -- - ## [1.0.0-beta.2] - 2020-04-30 ### Added - Re-Identification algorithm to merging bounding boxes automatically to the new UI () From 7820c943b7a12d9018f0b5c0b41ce9e549fe6fd3 Mon Sep 17 00:00:00 2001 From: Nikita Manovich Date: Fri, 29 May 2020 17:54:49 +0300 Subject: [PATCH 4/4] Update CVAT version --- cvat/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cvat/__init__.py b/cvat/__init__.py index 6409842f25f8..61cafddfe3db 100644 --- a/cvat/__init__.py +++ b/cvat/__init__.py @@ -4,6 +4,6 @@ from cvat.utils.version import get_version -VERSION = (1, 0, 0, 'rc', 0) +VERSION = (1, 0, 0, 'final', 0) __version__ = get_version(VERSION)