diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 6d7accf180a0a56e4514ceebeb6cc3686100846b..021d4604eca02a6695366038b197ec9a72ae7c36 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,4 +1,4 @@ -Changes in Release 2.x.x +Changes in Release 2.2.0 -------------------------------------------------------------------------------- * Introduced CreateMeanlDDTHA function to evaluate the consistency of a diff --git a/CMakeLists.txt b/CMakeLists.txt index 8809e117683a52d1825ff124dad9b0991d8655b4..e64a83ad54034fb980330ad8963416b443748bca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ cmake_policy(SET CMP0060 NEW) project(OpenStructure CXX C) set (CMAKE_EXPORT_COMPILE_COMMANDS 1) set (OST_VERSION_MAJOR 2) -set (OST_VERSION_MINOR 1) +set (OST_VERSION_MINOR 2) set (OST_VERSION_PATCH 0) set (OST_VERSION_STRING ${OST_VERSION_MAJOR}.${OST_VERSION_MINOR}.${OST_VERSION_PATCH} ) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake_support) diff --git a/docker/Dockerfile b/docker/Dockerfile index 7691651ae789cb6ae86da198f7ca719a624d8e74..a2a6abeaebb686f13cf0ac63e3a76fc2a3ce3085 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:18.04 # ARGUMENTS ########### -ARG OPENSTRUCTURE_VERSION="2.1.0" +ARG OPENSTRUCTURE_VERSION="2.2.0" ARG SRC_FOLDER="/usr/local/src" ARG CPUS_FOR_MAKE=2 ARG MSMS_VERSION="2.6.1" diff --git a/singularity/Singularity b/singularity/Singularity index 9aa5176634186bfea200cc4fb2efaa60b3700ad2..935e5c62c9a4d8b8d15974b5c47dc265748f5622 100644 --- a/singularity/Singularity +++ b/singularity/Singularity @@ -1,5 +1,5 @@ BootStrap: docker -From: registry.scicore.unibas.ch/schwede/openstructure:2.1.0-bionic +From: registry.scicore.unibas.ch/schwede/openstructure:2.2.0 %post ############################################################################## # POST