Skip to content
Snippets Groups Projects
Verified Commit f85fcabe authored by Daniel Hornung's avatar Daniel Hornung
Browse files

Merge branch 'f-table-json-data-schema' into f-convert-xlsx-to-json

parents 35e621d0 4e2a676f
Branches
Tags
2 merge requests!107Release v0.11.0,!102ENH: XLSX reader
Pipeline #50338 failed
...@@ -8,6 +8,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -8,6 +8,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added ### ### Added ###
### Changed ###
### Deprecated ###
### Removed ###
### Fixed ###
### Security ###
### Documentation ###
## [0.10.0] - 2024-04-24 ##
### Added ###
- XLSX handling: template generator and conversion from Json to XLSX - XLSX handling: template generator and conversion from Json to XLSX
- Json schema exporter: - Json schema exporter:
- has new parameter `use_rt_pool` - has new parameter `use_rt_pool`
...@@ -19,8 +35,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -19,8 +35,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* `table_converter.to_table` now returns an empty DataFrame instead of raising a * `table_converter.to_table` now returns an empty DataFrame instead of raising a
ValueError when called with an empty container. ValueError when called with an empty container.
### Deprecated ###
### Removed ### ### Removed ###
* The deprecated `parent` keyword from the YAML datamodel specification. Use * The deprecated `parent` keyword from the YAML datamodel specification. Use
...@@ -30,9 +44,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -30,9 +44,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed ### ### Fixed ###
- Json schema exporter handles reference properties better. - Json schema exporter handles reference properties better.
- [#59](https://gitlab.com/linkahead/linkahead-advanced-user-tools/-/issues/59) `to_table` failed on lists as values. - [#59](https://gitlab.com/linkahead/linkahead-advanced-user-tools/-/issues/59)
`to_table` failed on lists as values.
### Security ###
### Documentation ### ### Documentation ###
......
...@@ -20,6 +20,6 @@ authors: ...@@ -20,6 +20,6 @@ authors:
given-names: Stefan given-names: Stefan
orcid: https://orcid.org/0000-0001-7214-8125 orcid: https://orcid.org/0000-0001-7214-8125
title: CaosDB - Advanced User Tools title: CaosDB - Advanced User Tools
version: 0.9.0 version: 0.10.0
doi: 10.3390/data4020083 doi: 10.3390/data4020083
date-released: 2023-11-27 date-released: 2024-04-24
\ No newline at end of file \ No newline at end of file
...@@ -52,7 +52,7 @@ Conduct](https://gitlab.com/caosdb/caosdb/-/blob/dev/CODE_OF_CONDUCT.md). ...@@ -52,7 +52,7 @@ Conduct](https://gitlab.com/caosdb/caosdb/-/blob/dev/CODE_OF_CONDUCT.md).
* Copyright (C) 2018 Research Group Biomedical Physics, Max Planck Institute * Copyright (C) 2018 Research Group Biomedical Physics, Max Planck Institute
for Dynamics and Self-Organization Göttingen. for Dynamics and Self-Organization Göttingen.
* Copyright (C) 2020-2021 Indiscale GmbH <info@indiscale.com> * Copyright (C) 2020-2023 Indiscale GmbH <info@indiscale.com>
All files in this repository are licensed under a [GNU Affero General Public All files in this repository are licensed under a [GNU Affero General Public
License](LICENCE.md) (version 3 or later). License](LICENCE.md) (version 3 or later).
...@@ -46,7 +46,7 @@ from setuptools import find_packages, setup ...@@ -46,7 +46,7 @@ from setuptools import find_packages, setup
######################################################################## ########################################################################
MAJOR = 0 MAJOR = 0
MINOR = 9 MINOR = 10
MICRO = 1 MICRO = 1
PRE = "" # e.g. rc0, alpha.1, 0.beta-23 PRE = "" # e.g. rc0, alpha.1, 0.beta-23
ISRELEASED = False ISRELEASED = False
......
...@@ -27,9 +27,9 @@ copyright = '2023, IndiScale GmbH' ...@@ -27,9 +27,9 @@ copyright = '2023, IndiScale GmbH'
author = 'Daniel Hornung' author = 'Daniel Hornung'
# The short X.Y version # The short X.Y version
version = '0.9.1' version = '0.10.1'
# The full version, including alpha/beta/rc tags # The full version, including alpha/beta/rc tags
release = '0.9.1-dev' release = '0.10.1-dev'
# -- General configuration --------------------------------------------------- # -- General configuration ---------------------------------------------------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment