From 6ca236b009559b10eb6055f7e272089d85d21e57 Mon Sep 17 00:00:00 2001 From: Gabriel Studer <gabriel.studer@unibas.ch> Date: Mon, 9 Nov 2020 21:30:01 +0100 Subject: [PATCH] Update version to 4.2.0 --- CHANGELOG.txt | 2 +- CMakeLists.txt | 4 ++-- doc/source/conf.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index e207f12..ad3a6db 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,4 +1,4 @@ -Changes in Release 4.x +Changes in Release 4.2.0 -------------------------------------------------------------------------------- * Detect Boost and Python using functionality provided by CMake instead of our diff --git a/CMakeLists.txt b/CMakeLists.txt index f8b0663..26944b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.12.1 FATAL_ERROR) cmake_policy(SET CMP0060 NEW) set (QMEAN_VERSION_MAJOR 4) -set (QMEAN_VERSION_MINOR 1) +set (QMEAN_VERSION_MINOR 2) set (QMEAN_VERSION_PATCH 0) set (QMEAN_VERSION_STRING ${QMEAN_VERSION_MAJOR}.${QMEAN_VERSION_MINOR}.${QMEAN_VERSION_PATCH} ) @@ -74,7 +74,7 @@ set(PYTHON_MODULE_PATH "python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/si setup_boost() -find_package(OPENSTRUCTURE 2.1.0 REQUIRED +find_package(OPENSTRUCTURE 2.2.0 REQUIRED COMPONENTS mol seq seq_alg mol_alg conop db) include_directories(${Boost_INCLUDE_DIRS} diff --git a/doc/source/conf.py b/doc/source/conf.py index 44ed439..d205f22 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -70,9 +70,9 @@ copyright = u'2016-2020, Gabriel Studer' # built documents. # # The short X.Y version. -release = '4.1.0' +release = '4.2.0' # The full version, including alpha/beta/rc tags. -release = '4.1.0' +release = '4.2.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. -- GitLab