Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
ProMod3
Manage
Activity
Members
Plan
Jira
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
schwede
ProMod3
Commits
b0a14c0f
Commit
b0a14c0f
authored
9 months ago
by
Studer Gabriel
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into develop
parents
792e285b
48b05491
No related branches found
No related tags found
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
CHANGELOG
+1
-1
1 addition, 1 deletion
CHANGELOG
CMakeLists.txt
+2
-2
2 additions, 2 deletions
CMakeLists.txt
container/Dockerfile
+2
-2
2 additions, 2 deletions
container/Dockerfile
container/Singularity
+1
-1
1 addition, 1 deletion
container/Singularity
doc/conf.py.in
+1
-1
1 addition, 1 deletion
doc/conf.py.in
with
7 additions
and
7 deletions
CHANGELOG
+
1
−
1
View file @
b0a14c0f
...
...
@@ -5,7 +5,7 @@
Changelog
================================================================================
Release 3.
x.x
Release 3.
4.1
--------------------------------------------------------------------------------
* Bugfix release: Updates OpenStructure dependency to 2.8.0, fixes issues
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
2
−
2
View file @
b0a14c0f
...
...
@@ -25,7 +25,7 @@ include(PROMOD3)
# versioning info
set
(
PROMOD3_VERSION_MAJOR 3
)
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_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.
6
.0 REQUIRED
find_package
(
OPENSTRUCTURE 2.
8
.0 REQUIRED
COMPONENTS io mol seq seq_alg mol_alg conop img mol_mm
)
if
(
CMAKE_COMPILER_IS_GNUCXX
)
...
...
This diff is collapsed.
Click to expand it.
container/Dockerfile
+
2
−
2
View file @
b0a14c0f
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}
# ARGUMENTS
###########
ARG
PROMOD_VERSION="3.4.
0
"
ARG
PROMOD_VERSION="3.4.
1
"
ARG
SRC_FOLDER="/usr/local/src"
...
...
This diff is collapsed.
Click to expand it.
container/Singularity
+
1
−
1
View file @
b0a14c0f
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
...
...
This diff is collapsed.
Click to expand it.
doc/conf.py.in
+
1
−
1
View file @
b0a14c0f
...
...
@@ -286,7 +286,7 @@ rst_epilog = """
.. |cmake| replace:: CMake
.. |ost_l| replace:: OpenStructure
.. |ost_s| replace:: OST
.. |ost_version| replace:: 2.
6
.0
.. |ost_version| replace:: 2.
8
.0
.. |python| replace:: Python
.. |sphinx| replace:: Sphinx
.. _sphinx: http://sphinx-doc.org/
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment