diff --git a/.qube.yml b/.qube.yml index 61f1ef9e6..944bcf9c0 100644 --- a/.qube.yml +++ b/.qube.yml @@ -4,7 +4,7 @@ email: sven.fillinger@qbic.uni-tuebingen.de project_name: data-model-lib project_short_description: "Data models. A collection of QBiC's central data models\ \ and DTOs. " -version: 2.7.0 +version: 2.8.0-SNAPSHOT domain: lib language: groovy project_slug: data-model-lib diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c499eb71d..ea7b1b04a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,32 @@ Changelog This project adheres to `Semantic Versioning `_. +2.8.0-SNAPSHOT (2021-05-21) +--------------------------- + +**Added** + +* Add new product unit types to ``life.qbic.datamodel.dtos.business.services.ProductUnit`` (`#215 `_) + + - PER_HOUR("Hour"), + - PER_PROJECT("Project"), + - PER_RUN("Run"), + - PER_CYCLE("Cycle"), + - PER_GEL("Gel/HpH"), + - PER_10_MG("10 milligram"), + - PER_MEASUREMENT("Measurement"), + - PER_CHANNEL("Channel"), + - PER_100_MICROGRAM_PEPTIDE_CHANNEL("100 microgram peptides channel"), + - PER_500_ML("500 milliliter"), + - PER_COMPARISON("Comparison") + +**Fixed** + +**Dependencies** + +**Deprecated** + + 2.7.0 (2021-05-21) ------------------ diff --git a/docs/conf.py b/docs/conf.py index 020d165f7..30fdc522c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -55,9 +55,9 @@ # the built documents. # # The short X.Y version. -version = '2.7.0' +version = '2.8.0-SNAPSHOT' # The full version, including alpha/beta/rc tags. -release = '2.7.0' +release = '2.8.0-SNAPSHOT' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/pom.xml b/pom.xml index f81f51abd..f9d5b3fe4 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ life.qbic data-model-lib - 2.7.0 + 2.8.0-SNAPSHOT data-model-lib http://github.com/qbicsoftware/data-model-lib Data models. A collection of QBiC's central data models and DTOs. diff --git a/qube.cfg b/qube.cfg index 0f8ac4a43..a731dce23 100644 --- a/qube.cfg +++ b/qube.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.7.0 +current_version = 2.8.0-SNAPSHOT [bumpversion_files_whitelisted] dot_qube = .qube.yml diff --git a/src/main/groovy/life/qbic/datamodel/dtos/business/services/ProductUnit.groovy b/src/main/groovy/life/qbic/datamodel/dtos/business/services/ProductUnit.groovy index 4c38252f7..c4b626bac 100644 --- a/src/main/groovy/life/qbic/datamodel/dtos/business/services/ProductUnit.groovy +++ b/src/main/groovy/life/qbic/datamodel/dtos/business/services/ProductUnit.groovy @@ -10,7 +10,17 @@ enum ProductUnit { PER_GIGABYTE("Gigabyte"), PER_SAMPLE("Sample"), PER_DATASET("Dataset"), - PER_HOUR("Hour") + PER_HOUR("Hour"), + PER_PROJECT("Project"), + PER_RUN("Run"), + PER_CYCLE("Cycle"), + PER_GEL("Gel/HpH"), + PER_10_MG("10 milligram"), + PER_MEASUREMENT("Measurement"), + PER_CHANNEL("Channel"), + PER_100_MICROGRAM_PEPTIDE_CHANNEL("100 microgram peptides channel"), + PER_500_ML("500 milliliter"), + PER_COMPARISON("Comparison") /** Holds the String value of the enum @@ -42,4 +52,4 @@ enum ProductUnit { return this.getValue() } -} \ No newline at end of file +}