From 4f009de69791f8a85ed192c64ed3520b2630fa03 Mon Sep 17 00:00:00 2001
From: Gabriel Studer <gabriel.studer@unibas.ch>
Date: Mon, 9 Nov 2020 18:59:51 +0100
Subject: [PATCH] Update version to 3.2.0
---
CHANGELOG | 2 +-
CMakeLists.txt | 6 +++---
container/Dockerfile | 4 ++--
container/Singularity | 2 +-
doc/conf.py.in | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 2a1fc7b1..82206354 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 3f3886fd..b58f41d3 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 b4d82a2f..0c09764e 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 2b9f8f1f..6932ddfd 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 08c65e05..4840eb32 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/
--
GitLab