From 74ba9aa5ddc1f8205250c8ebcecd6480b232f8d6 Mon Sep 17 00:00:00 2001
From: B13nch3n <stefan.bienert@me.com>
Date: Thu, 23 Jul 2020 17:15:40 +0200
Subject: [PATCH] Update version to 2.1.0
---
CHANGELOG.txt | 4 ++--
CMakeLists.txt | 2 +-
docker/Dockerfile | 2 +-
singularity/Singularity | 3 +--
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 822729767..01f62d91c 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,7 +1,7 @@
-Changes in Release 2.x
+Changes in Release 2.1.0
--------------------------------------------------------------------------------
- * Use the newer voronota implementation as default in CAD-score binding
+ * Use the newer Voronota implementation as default in CAD-score binding
* Added HHblits3 support - HHblits2 still supported but considered deprecated
* HMMScore: HMM-HMM alignment score as it is optimized in HHblits searches
* Support for the new carbohydrate-extension in the mmCIF file format
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91af96562..6bd006d78 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 0)
+set (OST_VERSION_MINOR 1)
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 63df3f9e4..b0863e783 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:18.04
# ARGUMENTS
###########
-ARG OPENSTRUCTURE_VERSION="2.0.0"
+ARG OPENSTRUCTURE_VERSION="2.1.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 9e445f865..9aa517663 100644
--- a/singularity/Singularity
+++ b/singularity/Singularity
@@ -1,6 +1,5 @@
BootStrap: docker
-From: registry.scicore.unibas.ch/schwede/openstructure:2.0.0-bionic
-
+From: registry.scicore.unibas.ch/schwede/openstructure:2.1.0-bionic
%post
##############################################################################
# POST
--
GitLab