diff --git a/CHANGELOG.md b/CHANGELOG.md index 27d2e821..5067f6df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,26 @@ 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.alpha] - 2020-02-XX +## [1.0.0-beta] - Unreleased +### Added +- + +### Changed +- + +### Deprecated +- + +### Removed +- + +### Fixed +- + +### Security +- + +## [0.6.0] - 2020-03-15 ### Added - Server only support for projects. Extend REST API v1 (/api/v1/projects*) - Ability to get basic information about users without admin permissions ([#750](https://github.com/opencv/cvat/issues/750)) @@ -28,12 +47,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Yolov3 interpretation script fix and changes to mapping.json - YOLO format support ([#1151](https://github.com/opencv/cvat/pull/1151)) -### Deprecated -- - -### Removed -- - ### Fixed - Exception in Git plugin [#826](https://github.com/opencv/cvat/issues/826) - Label ids in TFrecord format now start from 1 [#866](https://github.com/opencv/cvat/issues/866) @@ -42,8 +55,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Output labels for VOC format can be specified with Datumaro [#942](https://github.com/opencv/cvat/issues/942) - Annotations can be filtered before dumping with Datumaro [#994](https://github.com/opencv/cvat/issues/994) -### Security -- +## [0.5.2] - 2019-12-15 +### Fixed +- Frozen version of scikit-image==0.15 in requirements.txt because next releases don't support Python 3.5 ## [0.5.1] - 2019-10-17 ### Added diff --git a/cvat/__init__.py b/cvat/__init__.py index 0b03de53..59cc506f 100644 --- a/cvat/__init__.py +++ b/cvat/__init__.py @@ -1,10 +1,9 @@ - -# Copyright (C) 2018 Intel Corporation +# Copyright (C) 2018-2020 Intel Corporation # # SPDX-License-Identifier: MIT from cvat.utils.version import get_version -VERSION = (0, 6, 0, 'alpha', 0) +VERSION = (1, 0, 0, 'alpha', 0) __version__ = get_version(VERSION) diff --git a/cvat/apps/annotation/annotation.py b/cvat/apps/annotation/annotation.py index 9c805154..70054255 100644 --- a/cvat/apps/annotation/annotation.py +++ b/cvat/apps/annotation/annotation.py @@ -322,7 +322,7 @@ class Annotation: annotations = {} data_manager = DataManager(self._annotation_ir) - for shape in data_manager.to_shapes(self._db_task.size): + for shape in sorted(data_manager.to_shapes(self._db_task.size), key=lambda s: s.get("z_order", 0)): _get_frame(annotations, shape).labeled_shapes.append(self._export_labeled_shape(shape)) for tag in self._annotation_ir.tags: