diff --git a/CHANGELOG.txt b/CHANGELOG.txt index cc27ac4cae7c9950979a58f0fdb377334e07a356..08aae7b66bc5be5f3048dc41cd1c512d21970102 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,4 +1,4 @@ -Changes in Release 3.X.0 +Changes in Release 3.2.0 -------------------------------------------------------------------------------- * Added automated testing of all example scripts in the documentation diff --git a/CMakeLists.txt b/CMakeLists.txt index 447414c9d6f312ec325b95774b909297d3fa8493..ba6205363d168d088e8dc2585abc9ad4a98f603b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,9 +3,9 @@ #------------------------------------------------------------------------------- cmake_minimum_required(VERSION 2.6.4 FATAL_ERROR) -set (QMEAN_VERSION_MAJOR 3) -set (QMEAN_VERSION_MINOR 1) -set (QMEAN_VERSION_PATCH 0) +set (QMEAN_VERSION_MAJOR 3) +set (QMEAN_VERSION_MINOR 2) +set (QMEAN_VERSION_PATCH 0) set (QMEAN_VERSION_STRING ${QMEAN_VERSION_MAJOR}.${QMEAN_VERSION_MINOR}.${QMEAN_VERSION_PATCH} ) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake_support) @@ -61,7 +61,7 @@ string(REPLACE "." ";" _python_version_list ${PYTHON_VERSION}) list(GET _python_version_list 0 PYTHON_VERSION_MAJOR) list(GET _python_version_list 1 PYTHON_VERSION_MINOR) -find_package(OPENSTRUCTURE 1.10.0 REQUIRED +find_package(OPENSTRUCTURE 1.11.0 REQUIRED COMPONENTS mol seq seq_alg mol_alg conop) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY) diff --git a/doc/source/conf.py b/doc/source/conf.py index 0b92253817e90db99628d2ae32d64a0844d5a60d..cd58ae8739d43542c950f7f3fc5846aeca116106 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -63,16 +63,16 @@ master_doc = 'index' # General information about the project. project = u'QMEAN' -copyright = u'2016-2019, Gabriel Studer' +copyright = u'2016-2020, Gabriel Studer' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -release = '3.1.0' +release = '3.2.0' # The full version, including alpha/beta/rc tags. -release = '3.1.0' +release = '3.2.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.