diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 950085ab9556c5133f8eb473a7233df0887c7682..ea3c60e1ad55bdae6936eb6677b188327f6f2bb1 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,4 +1,4 @@ -Changes in Release 1.X.0 +Changes in Release 1.11.0 -------------------------------------------------------------------------------- * This is expected to be the last release supporting Python 2. diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b76c4eeabb796d74a31491335e6be9ab53c2a2b..c7b1c5ceeafa4fafc9863670a718cdac505261f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 2.6.4 FATAL_ERROR) project(OpenStructure CXX C) set (CMAKE_EXPORT_COMPILE_COMMANDS 1) set (OST_VERSION_MAJOR 1) -set (OST_VERSION_MINOR 10) +set (OST_VERSION_MINOR 11) set (OST_VERSION_PATCH 0) set (OST_VERSION_STRING ${OST_VERSION_MAJOR}.${OST_VERSION_MINOR}.${OST_VERSION_PATCH} ) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake_support) diff --git a/docker/Dockerfile b/docker/Dockerfile index a02301453bc4c02b5cbb0de4a2948d64f2d15d0e..552fa6b4f46ec6a6818e5ab3cc35d210e75d386a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:18.04 # ARGUMENTS ########### -ARG OPENSTRUCTURE_VERSION="1.10.0" +ARG OPENSTRUCTURE_VERSION="1.11.0" ARG SRC_FOLDER="/usr/local/src" ARG CPUS_FOR_MAKE=8 ARG PYTHONPATH="/usr/local/lib64/python2.7/site-packages:${PYTHONPATH}" diff --git a/singularity/Singularity b/singularity/Singularity index 429cb86a501f77822f52648490f7cf89e8a6ad61..610c3d29911551d2686701d4dfc8323904cdc709 100644 --- a/singularity/Singularity +++ b/singularity/Singularity @@ -17,7 +17,7 @@ export CPUS_FOR_MAKE=8 export PYTHONPATH="/usr/local/lib64/python2.7/site-packages:${PYTHONPATH}" # When changing OPENSTRUCTURE_VERSION make sure to change it also in the # environment section of singularity recipe (this file). -export OPENSTRUCTURE_VERSION="1.10.0" +export OPENSTRUCTURE_VERSION="1.11.0" export OPENSTRUCTURE_SHARE="/usr/local/share/ost" export MSMS_VERSION="2.6.1" export OPENMM_VERSION="7.1.1" @@ -214,7 +214,7 @@ cd /home # ENVIRONMENT ############################################################################## export OST_ROOT="/usr/local" -export OPENSTRUCTURE_VERSION="1.10.0" +export OPENSTRUCTURE_VERSION="1.11.0" export OPENMM_LIB_PATH=/usr/local/openmm/lib/ export PYTHONPATH="/usr/local/lib64/python2.7/site-packages:${PYTHONPATH}" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib64:${OPENMM_LIB_PATH}"