Skip to content
Snippets Groups Projects
Commit bbb21e34 authored by Henrik tom Wörden's avatar Henrik tom Wörden
Browse files

Merge branch 'dev' into f-lists

parents 489f718a 9e73d96b
No related branches found
No related tags found
3 merge requests!159Release 0.16.o,!155Review filter lists and compare_entities,!137Allow property and parent lists to be filtered.
...@@ -5,9 +5,24 @@ All notable changes to this project will be documented in this file. ...@@ -5,9 +5,24 @@ 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.1.0/), The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased] ##
### Added ###
### Changed ###
* `_ParentList` is now called `ParentList` * `_ParentList` is now called `ParentList`
* `_Properties` is now called `PropertyList` * `_Properties` is now called `PropertyList`
### Deprecated ###
### Removed ###
### Fixed ###
### Security ###
### Documentation ###
## [0.15.1] - 2024-08-21 ## ## [0.15.1] - 2024-08-21 ##
### Deprecated ### ### Deprecated ###
......
...@@ -46,10 +46,10 @@ from setuptools import find_packages, setup ...@@ -46,10 +46,10 @@ from setuptools import find_packages, setup
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
######################################################################## ########################################################################
ISRELEASED = True ISRELEASED = False
MAJOR = 0 MAJOR = 0
MINOR = 15 MINOR = 15
MICRO = 1 MICRO = 2
# Do not tag as pre-release until this commit # Do not tag as pre-release until this commit
# https://github.com/pypa/packaging/pull/515 # https://github.com/pypa/packaging/pull/515
# has made it into a release. Probably we should wait for pypa/packaging>=21.4 # has made it into a release. Probably we should wait for pypa/packaging>=21.4
......
...@@ -29,10 +29,10 @@ copyright = '2023, IndiScale GmbH' ...@@ -29,10 +29,10 @@ copyright = '2023, IndiScale GmbH'
author = 'Daniel Hornung' author = 'Daniel Hornung'
# The short X.Y version # The short X.Y version
version = '0.15.1' version = '0.15.2'
# The full version, including alpha/beta/rc tags # The full version, including alpha/beta/rc tags
# release = '0.5.2-rc2' # release = '0.5.2-rc2'
release = '0.15.1' release = '0.15.2-dev'
# -- General configuration --------------------------------------------------- # -- General configuration ---------------------------------------------------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment