diff --git a/CMakeLists.txt b/CMakeLists.txt index 696f3592cf5f815f916b28a4e1618c75528f74b2..cab348acf39f7fa79042d67a6485159d6b9fd83b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,8 +23,8 @@ project(ProMod3 CXX C) include(PROMOD3) # versioning info -set(PROMOD3_VERSION_MAJOR 2) -set(PROMOD3_VERSION_MINOR 1) +set(PROMOD3_VERSION_MAJOR 3) +set(PROMOD3_VERSION_MINOR 0) 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}) @@ -101,7 +101,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.11.0 REQUIRED +find_package(OPENSTRUCTURE 2.0.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 f32022d62ec1c437023115d1a37c0f06aff7843d..d99552cab31b6a55b14ce0fc3b1ed3fd728a20bc 100644 --- a/container/Dockerfile +++ b/container/Dockerfile @@ -2,7 +2,7 @@ FROM registry.scicore.unibas.ch/schwede/openstructure:python3_test2 # ARGUMENTS ########### -ARG OPENSTRUCTURE_VERSION="python3_test2" +ARG OPENSTRUCTURE_VERSION="2.0.0" ARG PROMOD_VERSION="3.0.0" ARG SRC_FOLDER="/usr/local/src" diff --git a/doc/conf.py.in b/doc/conf.py.in index 116d11e729b688038b06a349769f8509fb1af301..8f97db296b46d1a2ca12e70f367b0552bdb81200 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.11.0 +.. |ost_version| replace:: 2.0.0 .. |python| replace:: Python .. |sphinx| replace:: Sphinx .. _sphinx: http://sphinx-doc.org/ diff --git a/scripts/bump-version.py b/scripts/bump-version.py index f33faf9c61bbb9e536e183a313e40b7415443638..c61bd1c945f49a86063c0b60caa4a636d6a0e101 100644 --- a/scripts/bump-version.py +++ b/scripts/bump-version.py @@ -1,10 +1,6 @@ #!/usr/bin/env python import sys -raise RuntimeError("Many things have changed in the Python 3 port. " + - "bump-version.py might require updates. " + - "Only remove this error after careful checking!") - if len(sys.argv) < 3: print("USAGE: python scripts/bump-version.py PM3_VERSION OST_VERSION") print("-> *_VERSION format is MAJOR.MINOR.PATCH (e.g. 1.9.1)")