diff --git a/CHANGELOG b/CHANGELOG index 2a1fc7b16a30e197ded81d00c08fd93af3e11b6b..822063549d01bf3e67763c25232f558673ce1aa0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,7 +5,7 @@ Changelog ================================================================================ -Release 3.2.x +Release 3.2.0 -------------------------------------------------------------------------------- * Remove outdated configuration scripts (Fedora 19 / ancient Mac) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f3886fd5dd292e7a444005ebe294d7a10a4a97b..b58f41d3c278297e6258ca22b316692daf6c1f12 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,8 +24,8 @@ include(PROMOD3) # versioning info set(PROMOD3_VERSION_MAJOR 3) -set(PROMOD3_VERSION_MINOR 1) -set(PROMOD3_VERSION_PATCH 1) +set(PROMOD3_VERSION_MINOR 2) +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}) @@ -103,7 +103,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 2.1.0 REQUIRED +find_package(OPENSTRUCTURE 2.2.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 b4d82a2f011ea011ec36bd1bb583f738cc1250db..0c09764e0aa41eb103d03d869efa9c85207ff4d0 100644 --- a/container/Dockerfile +++ b/container/Dockerfile @@ -1,9 +1,9 @@ -ARG OPENSTRUCTURE_IMAGE_TAG="2.1.0-bionic" +ARG OPENSTRUCTURE_IMAGE_TAG="2.2.0-bionic" FROM registry.scicore.unibas.ch/schwede/openstructure:${OPENSTRUCTURE_IMAGE_TAG} # ARGUMENTS ########### -ARG PROMOD_VERSION="3.1.1" +ARG PROMOD_VERSION="3.2.0" ARG SRC_FOLDER="/usr/local/src" diff --git a/container/Singularity b/container/Singularity index 2b9f8f1fee08920e12d46138000dc05af4585b86..6932ddfdc129c5e1ee0f1cd217c5ee63df41f955 100644 --- a/container/Singularity +++ b/container/Singularity @@ -1,5 +1,5 @@ BootStrap: docker -From: registry.scicore.unibas.ch/schwede/promod3:3.1.1-OST2.1.0-bionic +From: registry.scicore.unibas.ch/schwede/promod3:3.2.0-OST2.2.0-bionic %post ############################################################################## # POST diff --git a/doc/conf.py.in b/doc/conf.py.in index 08c65e05183e857dd016281843395d512b1bc7f9..4840eb328a28a1201185757fcb089242d1f322c6 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:: 2.1.0 +.. |ost_version| replace:: 2.2.0 .. |python| replace:: Python .. |sphinx| replace:: Sphinx .. _sphinx: http://sphinx-doc.org/