Skip to content

Commit 4bd4a42

Browse files
committed
Merge remote-tracking branch 'origin/brainvisa-5.1'
2 parents de3eb53 + ff2be05 commit 4bd4a42

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ Main Features
4747
Documentation
4848
-------------
4949

50-
Visit Soma-workflow (http://www.brainvisa.info/soma-workflow/sphinx/) main page!
50+
Visit Soma-workflow (https://brainvisa.info/soma-workflow/sphinx/) main page!
5151

52-
An extensive documentation (http://www.brainvisa.info/doc/soma-workflow/sphinx/index.html) is available,
53-
with ready to use examples (http://www.brainvisa.info/doc/soma-workflow/sphinx/examples.html).
52+
An extensive documentation (https://brainvisa.info/doc/soma-workflow/sphinx/index.html) is available,
53+
with ready to use examples (https://brainvisa.info/doc/soma-workflow/sphinx/examples.html).
5454

5555
The git master branch doc is also updated on github: https://populse.github.io/soma-workflow/
5656

@@ -99,11 +99,11 @@ Installation
9999

100100
**Windows (tested on Vista 64 bit for local mode)**
101101

102-
1) Go to http://www.python.org/download/ to download and install python Windows Installer according to your windows version, for example in C:\Python27.
102+
1) Go to https://www.python.org/download/ to download and install python Windows Installer according to your windows version, for example in C:\Python27.
103103

104-
2) Set environment variable PATH that contains python directory (see http://docs.python.org/2/using/windows.html), for example in C:\Python27.
104+
2) Set environment variable PATH that contains python directory (see https://docs.python.org/2/using/windows.html), for example in C:\Python27.
105105

106-
3) Download and install PyQt4 for python27 in http://www.riverbankcomputing.com/software/pyqt/download
106+
3) Download and install PyQt4 for python27 in https://www.riverbankcomputing.com/software/pyqt/download
107107

108108
4) Go to https://pypi.python.org/pypi/soma-workflow to download soma-workflow and extract it into a directory, for example, C:\soma-workflow.
109109

doc/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@
284284
autoclass_content = "both"
285285

286286
# Example configuration for intersphinx: refer to the Python standard library.
287-
intersphinx_mapping = {'http://docs.python.org/': None}
287+
intersphinx_mapping = {'https://docs.python.org/': None}
288288

289289
# versions of our software
290290
casadistro_version = '3.0'

doc/source/conf_github.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@
268268

269269

270270
# Example configuration for intersphinx: refer to the Python standard library.
271-
intersphinx_mapping = {'http://docs.python.org/': None}
271+
intersphinx_mapping = {'https://docs.python.org/': None}
272272

273273
extlinks = {
274274
'casadistro': ('https://brainvisa.github.io/casa-distro/%s',

doc/source/install_config.txt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ Requirements
2929
------------
3030

3131
* Python *version 2.7 or more*
32-
* `ZeroMQ <http://zeromq.org>`_
33-
* `Paramiko <http://www.lag.net/paramiko/>`_ *version 1.7 or more*. Paramiko in
32+
* `ZeroMQ <https://zeromq.org>`_
33+
* `Paramiko <https://www.lag.net/paramiko/>`_ *version 1.7 or more*. Paramiko in
3434
only required if the computing resource is remote (see config).
35-
* For the GUI: Qt *version 4.6.2 or more*, `PyQt <http://www.riverbankcomputing.co.uk/software/pyqt/intro>`_ *version 4.7.2 or more*, or `PySide <http://www.pyside.org>`_ *version 1.1.1 or more* and optionally `matplotlib <http://matplotlib.sourceforge.net/>`_ *version 0.99 or more*
35+
* For the GUI: Qt *version 4.6.2 or more*, `PyQt <https://www.riverbankcomputing.co.uk/software/pyqt/intro>`_ *version 4.7.2 or more*, or `PySide <https://www.pyside.org>`_ *version 1.1.1 or more* and optionally `matplotlib <https://matplotlib.org/>`_ *version 0.99 or more*
3636

3737
Installation
3838
------------
@@ -64,7 +64,7 @@ Start the GUI with the command *soma_workflow_gui* and/or import the soma_workfl
6464
Configuration (Created automatically)
6565
-------------------------------------
6666

67-
The configuration syntax is the `ConfigParser <http://docs.python.org/library/configparser.html>`_ syntax. The configuration file is located in "$HOME/.soma-workflow.cfg". This file will be created automatically once a server has been established (see :ref:`server_management`).
67+
The configuration syntax is the `ConfigParser <https://docs.python.org/library/configparser.html>`_ syntax. The configuration file is located in "$HOME/.soma-workflow.cfg". This file will be created automatically once a server has been established (see :ref:`server_management`).
6868

6969
There is one section for each computing resource (that is for each Soma-workflow database server).
7070

@@ -174,17 +174,17 @@ Here is the list of the server dependencies:
174174

175175
* A distributed resource management system (DRMS) such as Grid Engine, Condor,
176176
Torque/PBS, LSF..
177-
* A implementation of `DRMAA <http://www.drmaa.org/>`_ 1.0 for the DRMS in C if available, unless a specific :doc:`scheduler exists <scheduler>`
177+
* A implementation of `DRMAA <https://www.drmaa.org/>`_ 1.0 for the DRMS in C if available, unless a specific :doc:`scheduler exists <scheduler>`
178178
* Python *version 2.7 or more*
179179
* `zmq <http:/zeromq.org>`_
180-
* `SQLite <http://docs.python.org/library/sqlite3.html>`_ *version 3 or more*
180+
* `SQLite <https://docs.python.org/library/sqlite3.html>`_ *version 3 or more*
181181

182182
The implementations of DRMAA tested successfully with Soma-workflow:
183183

184184
=================== ===========================================
185185
DRMS DRMAA implementation
186186
=================== ===========================================
187-
Torque 2.0.0 `PBS DRMAA 1.0.13 <http://sourceforge.net/projects/pbspro-drmaa/files/pbs-drmaa/1.0/>`_ from http://apps.man.poznan.pl/trac/pbs-drmaa
187+
Torque 2.0.0 `PBS DRMAA 1.0.13 <https://sourceforge.net/projects/pbspro-drmaa/files/pbs-drmaa/1.0/>`_ from https://apps.man.poznan.pl/trac/pbs-drmaa
188188
LSF 7.0 FedStage LSF DRMAA 1.0.3
189189
Grid Engine 6.2u5&6 Embeded implementation
190190
Condor 7.4.0 Embeded implementation
@@ -221,7 +221,7 @@ Opening "Add Server" button, we can see a window as shown below:
221221
.. image:: images/ServerManagementAddServer.*
222222
:scale: 100
223223

224-
Before the server installation, we strongly recommend to use SSH with authentication key instead of password. See "http://askubuntu.com/questions/46930/how-can-i-set-up-password-less-ssh-login". Otherwise, you need to input password each time. We should setup the Server Address, SSH Login, while the other items are optional. (password is not mandatory when you are using authentication key)
224+
Before the server installation, we strongly recommend to use SSH with authentication key instead of password. See "https://askubuntu.com/questions/46930/how-can-i-set-up-password-less-ssh-login". Otherwise, you need to input password each time. We should setup the Server Address, SSH Login, while the other items are optional. (password is not mandatory when you are using authentication key)
225225

226226
Since the configuration is needed for both sides (client and server),
227227
the first button, called "Install on Server and Client", is used for configuring both sides. Since many clients can connect to one server, "Setup Client without Installation on Server" is used for configurating only client side.
@@ -236,7 +236,7 @@ Server configuration (Created automatically)
236236

237237
This section defines the required and optional configuration items. This file can be found on the both side of client and server with the path "$HOME/.soma-workflow.cfg".
238238

239-
The configuration file syntax is the `ConfigParser <http://docs.python.org/library/configparser.html>`_ syntax. All the configuration items are defined in one section. The name of
239+
The configuration file syntax is the `ConfigParser <https://docs.python.org/library/configparser.html>`_ syntax. All the configuration items are defined in one section. The name of
240240
the section is the resource identifier (ex: "Titan").
241241

242242

@@ -401,28 +401,28 @@ Configuration items optional on the server side:
401401

402402
**SERVER_LOG_LEVEL**
403403
Server logging level as defined in the `logging
404-
<http://docs.python.org/library/logging.html>`_ module.
404+
<https://docs.python.org/library/logging.html>`_ module.
405405

406406
**SERVER_LOG_FORMAT**
407-
Server logging format as defined in the `logging <http://docs.python.org/library/logging.html>`_ module.
407+
Server logging format as defined in the `logging <https://docs.python.org/library/logging.html>`_ module.
408408

409409
**ENGINE_LOG_DIR**
410410
Directory path where to store Workflow Engine log files.
411411

412412
**ENGINE_LOG_LEVEL**
413413
Workflow Engine logging level as defined in the `logging
414-
<http://docs.python.org/library/logging.html>`_ module.
414+
<https://docs.python.org/library/logging.html>`_ module.
415415

416416
**ENGINE_LOG_FORMAT**
417417
Workflow Engine logging format as defined in the `logging
418-
<http://docs.python.org/library/logging.html>`_ module.
418+
<https://docs.python.org/library/logging.html>`_ module.
419419

420420
**MPI_LOG_DIR**
421421
Directory path where to store the MPI workflow runner log files. (only used in MPI mode)
422422

423423
**MPI_LOG_FORMAT**
424424
MPI runner logging format as defined in the `logging
425-
<http://docs.python.org/library/logging.html>`_ module.
425+
<https://docs.python.org/library/logging.html>`_ module.
426426

427427
Parallel job configuration:
428428
^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -480,10 +480,10 @@ The requirements are thus:
480480

481481
* A distributed resource management system (DRMS) such as Grid Engine, Condor,
482482
Torque/PBS, LSF..
483-
* A implementation of `DRMAA <http://www.drmaa.org/>`_ 1.0 for the DRMS in C if available, unless a specific :doc:`scheduler exists <scheduler>`
483+
* A implementation of `DRMAA <https://www.drmaa.org/>`_ 1.0 for the DRMS in C if available, unless a specific :doc:`scheduler exists <scheduler>`
484484
* Python *version 2.7 or more*
485485
* SQLite *version 3 or more*
486-
* For the GUI: Qt *version 4.6.2 or more*, `PyQt <http://www.riverbankcomputing.co.uk/software/pyqt/intro>`_ *version 4.7.2 or more*, or `PySide <http://www.pyside.org>`_ *version 1.1.1* or more, and optionally `matplotlib <http://matplotlib.sourceforge.net/>`_ *version 0.99 or more*
486+
* For the GUI: Qt *version 4.6.2 or more*, `PyQt <https://www.riverbankcomputing.co.uk/software/pyqt/intro>`_ *version 4.7.2 or more*, or `PySide <https://www.pyside.org>`_ *version 1.1.1* or more, and optionally `matplotlib <httpq://matplotlib.org/>`_ *version 0.99 or more*
487487

488488
More details about the implementation of DRMAA can be found in the server
489489
installation section (see :ref:`server_requirements`).
@@ -511,7 +511,7 @@ This section defines the required and optional configuration items for the light
511511
mode.
512512

513513
The configuration file syntax is the `ConfigParser
514-
<http://docs.python.org/library/configparser.html>`_ syntax. All the
514+
<https://docs.python.org/library/configparser.html>`_ syntax. All the
515515
configuration items are defined in one section. The section name corresponds to
516516
the name you chose for the resource: "Local Titan" in the example.
517517

0 commit comments

Comments
 (0)