Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openstructure
Manage
Activity
Members
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
openstructure
Commits
79edde36
Commit
79edde36
authored
5 years ago
by
Gerardo Tauriello
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop' into release-1.10.0
These are only updates to documentation.
parents
7395e2a2
35a4fc84
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules/bindings/pymod/cadscore.py
+2
-2
2 additions, 2 deletions
modules/bindings/pymod/cadscore.py
modules/doc/install.rst
+10
-5
10 additions, 5 deletions
modules/doc/install.rst
with
12 additions
and
7 deletions
modules/bindings/pymod/cadscore.py
+
2
−
2
View file @
79edde36
...
...
@@ -79,8 +79,8 @@ class CADResult:
Dictionary containing local CAD
'
s atom-atom (AA) scores.
:type: dictionary (key: tuple(chain, resnum) (e.g.:
(
"
A
"
, ost.mol.ResNum(24)), value: CAD local AA score
(see CAD Documentation online)
(
"
A
"
, ost.mol.ResNum(24)), value: CAD local AA score
(see CAD Documentation online)
"""
def
__init__
(
self
,
globalAA
,
localAA
):
self
.
globalAA
=
globalAA
...
...
This diff is collapsed.
Click to expand it.
modules/doc/install.rst
+
10
−
5
View file @
79edde36
...
...
@@ -328,7 +328,8 @@ line. If omitted, the linker will throw a bunch of warnings later:
.. code-block:: bash
export SDKROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
export SDKROOT=/Applications/Xcode.app/Contents/Developer/Platforms/\
MacOSX.platform/Developer/SDKs/MacOSX.sdk
If building the info module or with graphical user interface, get the Qt
binaries in your Path for CMake to determine its configuration:
...
...
@@ -343,8 +344,10 @@ located as they are on Linux and hence they must be specified too:
.. code-block:: bash
cmake . -DPYTHON_INCLUDE_PATH=/usr/local/Cellar/python@2/2.7.16/Frameworks/Python.framework/Versions/2.7/include/python2.7 \
-DPYTHON_LIBRARIES=/usr/local/Cellar/python@2/2.7.16/Frameworks/Python.framework/Versions/2.7/lib/libpython2.7.dylib \
cmake . -DPYTHON_INCLUDE_PATH=/usr/local/Cellar/python@2/2.7.16/\
Frameworks/Python.framework/Versions/2.7/include/python2.7 \
-DPYTHON_LIBRARIES=/usr/local/Cellar/python@2/2.7.16/\
Frameworks/Python.framework/Versions/2.7/lib/libpython2.7.dylib \
-DPYTHON_ROOT=/usr/local/ \
-DBOOST_ROOT=/usr/local \
-DSYS_ROOT=/usr/local \
...
...
@@ -360,7 +363,8 @@ to run multiple jobs at once.
What's next?
--------------------------------------------------------------------------------
On Linux and macOS, you can start dng from the command-line. The binaries are all located in stage/bin:
On Linux and macOS, you can start dng from the command-line. The binaries are
all located in stage/bin:
.. code-block:: bash
...
...
@@ -372,7 +376,8 @@ or, to start the command-line interpreter:
stage/bin/ost
If you repeatedly use OpenStructure, it is recommended to add /path/to/ost/stage/bin to your path.
If you repeatedly use OpenStructure, it is recommended to add
/path/to/ost/stage/bin to your path.
Getting the newest changes
--------------------------------------------------------------------------------
...
...
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