Skip to content
Snippets Groups Projects
Commit b0a14c0f authored by Studer Gabriel's avatar Studer Gabriel
Browse files

Merge branch 'master' into develop

parents 792e285b 48b05491
No related branches found
No related tags found
No related merge requests found
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
Changelog Changelog
================================================================================ ================================================================================
Release 3.x.x Release 3.4.1
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
* Bugfix release: Updates OpenStructure dependency to 2.8.0, fixes issues * Bugfix release: Updates OpenStructure dependency to 2.8.0, fixes issues
......
...@@ -25,7 +25,7 @@ include(PROMOD3) ...@@ -25,7 +25,7 @@ include(PROMOD3)
# versioning info # versioning info
set(PROMOD3_VERSION_MAJOR 3) set(PROMOD3_VERSION_MAJOR 3)
set(PROMOD3_VERSION_MINOR 4) set(PROMOD3_VERSION_MINOR 4)
set(PROMOD3_VERSION_PATCH 0) set(PROMOD3_VERSION_PATCH 1)
set(PROMOD3_VERSION_STRING ${PROMOD3_VERSION_MAJOR}.${PROMOD3_VERSION_MINOR}) set(PROMOD3_VERSION_STRING ${PROMOD3_VERSION_MAJOR}.${PROMOD3_VERSION_MINOR})
set(PROMOD3_VERSION_STRING ${PROMOD3_VERSION_STRING}.${PROMOD3_VERSION_PATCH}) set(PROMOD3_VERSION_STRING ${PROMOD3_VERSION_STRING}.${PROMOD3_VERSION_PATCH})
...@@ -103,7 +103,7 @@ if(NOT DISABLE_DOCUMENTATION) ...@@ -103,7 +103,7 @@ if(NOT DISABLE_DOCUMENTATION)
# this URL should always point to the latest version of OST # this URL should always point to the latest version of OST
set(OST_DOC_URL "https://www.openstructure.org/docs") set(OST_DOC_URL "https://www.openstructure.org/docs")
endif() endif()
find_package(OPENSTRUCTURE 2.6.0 REQUIRED find_package(OPENSTRUCTURE 2.8.0 REQUIRED
COMPONENTS io mol seq seq_alg mol_alg conop img mol_mm) COMPONENTS io mol seq seq_alg mol_alg conop img mol_mm)
if(CMAKE_COMPILER_IS_GNUCXX) if(CMAKE_COMPILER_IS_GNUCXX)
......
ARG OPENSTRUCTURE_IMAGE_TAG="2.6.0-jammy" ARG OPENSTRUCTURE_IMAGE_TAG="2.8.0-jammy"
FROM registry.scicore.unibas.ch/schwede/openstructure:${OPENSTRUCTURE_IMAGE_TAG} FROM registry.scicore.unibas.ch/schwede/openstructure:${OPENSTRUCTURE_IMAGE_TAG}
# ARGUMENTS # ARGUMENTS
########### ###########
ARG PROMOD_VERSION="3.4.0" ARG PROMOD_VERSION="3.4.1"
ARG SRC_FOLDER="/usr/local/src" ARG SRC_FOLDER="/usr/local/src"
......
BootStrap: docker BootStrap: docker
From: registry.scicore.unibas.ch/schwede/promod3:3.4.0-OST2.7.0-jammy From: registry.scicore.unibas.ch/schwede/promod3:3.4.1-OST2.8.0-jammy
%post %post
############################################################################## ##############################################################################
# POST # POST
......
...@@ -286,7 +286,7 @@ rst_epilog = """ ...@@ -286,7 +286,7 @@ rst_epilog = """
.. |cmake| replace:: CMake .. |cmake| replace:: CMake
.. |ost_l| replace:: OpenStructure .. |ost_l| replace:: OpenStructure
.. |ost_s| replace:: OST .. |ost_s| replace:: OST
.. |ost_version| replace:: 2.6.0 .. |ost_version| replace:: 2.8.0
.. |python| replace:: Python .. |python| replace:: Python
.. |sphinx| replace:: Sphinx .. |sphinx| replace:: Sphinx
.. _sphinx: http://sphinx-doc.org/ .. _sphinx: http://sphinx-doc.org/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment