diff --git a/CHANGELOG b/CHANGELOG index e1cf7a6607e2152d43bd1dc21470d26b6c619c37..0e9ceb554298f192f7dea1e1b082a380fff4a766 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,7 +5,7 @@ Changelog ================================================================================ -Release 2.x.x +Release 2.1.0 -------------------------------------------------------------------------------- * This is expected to be the last release supporting Python 2. diff --git a/CMakeLists.txt b/CMakeLists.txt index b6e88667a2849484a2905d9272388f8e7ff77555..aa019d52d0b506257b02462a669b53b84274f2ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ include(PROMOD3) # versioning info set(PROMOD3_VERSION_MAJOR 2) -set(PROMOD3_VERSION_MINOR 0) +set(PROMOD3_VERSION_MINOR 1) set(PROMOD3_VERSION_PATCH 0) set(PROMOD3_VERSION_STRING ${PROMOD3_VERSION_MAJOR}.${PROMOD3_VERSION_MINOR}) set(PROMOD3_VERSION_STRING ${PROMOD3_VERSION_STRING}.${PROMOD3_VERSION_PATCH}) @@ -93,7 +93,7 @@ if(NOT DISABLE_DOCUMENTATION) # this URL should always point to the latest version of OST set(OST_DOC_URL "https://www.openstructure.org/docs") endif() -find_package(OPENSTRUCTURE 1.10.0 REQUIRED +find_package(OPENSTRUCTURE 1.11.0 REQUIRED COMPONENTS io mol seq seq_alg mol_alg conop img mol_mm) if(CMAKE_COMPILER_IS_GNUCXX) diff --git a/container/Dockerfile b/container/Dockerfile index d10d4d86de9e23d28dd3e9c30da17885db75cce5..95bba9ad920a7c645ae1f1000d3e6d0b38c9f7b5 100644 --- a/container/Dockerfile +++ b/container/Dockerfile @@ -2,8 +2,8 @@ FROM ubuntu:18.04 # ARGUMENTS ########### -ARG OPENSTRUCTURE_VERSION="1.10.0" -ARG PROMOD_VERSION="2.0.0" +ARG OPENSTRUCTURE_VERSION="1.11.0" +ARG PROMOD_VERSION="2.1.0" ARG SRC_FOLDER="/usr/local/src" ARG CPUS_FOR_MAKE=4 ARG COMPLIB_DIR="/usr/local/share/ost_complib" diff --git a/doc/conf.py.in b/doc/conf.py.in index cd8b794058aa1d9be11db588ff328f662e3106bf..116d11e729b688038b06a349769f8509fb1af301 100644 --- a/doc/conf.py.in +++ b/doc/conf.py.in @@ -286,7 +286,7 @@ rst_epilog = """ .. |cmake| replace:: CMake .. |ost_l| replace:: OpenStructure .. |ost_s| replace:: OST -.. |ost_version| replace:: 1.10.0 +.. |ost_version| replace:: 1.11.0 .. |python| replace:: Python .. |sphinx| replace:: Sphinx .. _sphinx: http://sphinx-doc.org/