Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .qube.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
26 changes: 26 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,32 @@ Changelog
This project adheres to `Semantic Versioning <https://semver.org/>`_.


2.8.0-SNAPSHOT (2021-05-21)
---------------------------

**Added**

* Add new product unit types to ``life.qbic.datamodel.dtos.business.services.ProductUnit`` (`#215 <https://github.com/qbicsoftware/data-model-lib/pull/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)
------------------

Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>life.qbic</groupId>
<artifactId>data-model-lib</artifactId>
<version>2.7.0</version> <!-- <<QUBE_FORCE_BUMP>> -->
<version>2.8.0-SNAPSHOT</version> <!-- <<QUBE_FORCE_BUMP>> -->
<name>data-model-lib</name>
<url>http://github.com/qbicsoftware/data-model-lib</url>
<description>Data models. A collection of QBiC's central data models and DTOs. </description>
Expand Down
2 changes: 1 addition & 1 deletion qube.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 2.7.0
current_version = 2.8.0-SNAPSHOT

[bumpversion_files_whitelisted]
dot_qube = .qube.yml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -42,4 +52,4 @@ enum ProductUnit {
return this.getValue()
}

}
}