Skip to content

Commit d0ac910

Browse files
committed
Release 1.7
Change-Id: I8ba7b1ff5d793cc4f8af4227000302a5530e7b61
1 parent 4cab4d0 commit d0ac910

File tree

11 files changed

+97
-130
lines changed

11 files changed

+97
-130
lines changed

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2015-11-10 S. Thiell <[email protected]>
2+
3+
* Version 1.7 released.
4+
15
2015-11-01 S. Thiell <[email protected]>
26

37
* Clush.py: added -P/--progress to force display of the live progress

README renamed to README.md

Lines changed: 43 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
-----------------------------------------
2-
ClusterShell 1.6 Python Library and Tools
3-
-----------------------------------------
1+
ClusterShell 1.7 Python Library and Tools
2+
=========================================
43

54
ClusterShell is an event-driven open source Python library, designed to run
65
local or distant commands in parallel on server farms or on large Linux
@@ -16,43 +15,44 @@ developers. It also provides clush, clubak and nodeset, three convenient
1615
command-line tools that allow traditional shell scripts to benefit from some
1716
of the library features.
1817

19-
-------------------
20-
Requirements (v1.6)
21-
-------------------
22-
23-
* GNU/Linux, *BSD, Mac OS X, etc.
24-
25-
* OpenSSH (ssh/scp)
18+
Requirements (v1.7)
19+
-------------------
2620

21+
* GNU/Linux, *BSD, Mac OS X
22+
* OpenSSH (ssh/scp) or rsh
2723
* Python 2.x (x >= 4)
24+
* PyYAML (optional)
2825

29-
-------
30-
License
31-
-------
26+
License
27+
-------
3228

3329
ClusterShell is distributed under the CeCILL-C license, a French transposition
3430
of the GNU LGPL, and is fully LGPL-compatible (see Licence_CeCILL-C_V1-en.txt).
3531

36-
------------
37-
Installation
38-
------------
32+
Documentation
33+
-------------
34+
35+
Online documentation is available here:
3936

40-
When possible, please use the RPM/deb package distribution:
37+
http://clustershell.readthedocs.org/
4138

42-
https://github.com/cea-hpc/clustershell/wiki/GetClusterShell
39+
The Sphinx documentation source is available under the doc/sphinx directory.
40+
Type 'make' to see all available formats (you need Sphinx installed and
41+
sphinx_rtd_theme to build the documentation). For example, to generate html
42+
docs, just type:
4343

44-
Otherwise in the source directory, use:
44+
make html BUILDDIR=/dest/path
4545

46-
# python setup.py install
47-
# cp -r conf /etc/clustershell
46+
For local library API documentation, just type:
47+
48+
$ pydoc ClusterShell
4849

49-
For installation on Mac OS X, please see:
50+
The following man pages are also provided:
5051

51-
https://github.com/cea-hpc/clustershell/wiki/ClusterShellOnMacOSX
52+
clush(1), clubak(1), nodeset(1), clush.conl(5), groups.conf(5)
5253

53-
----------
54-
Test Suite
55-
----------
54+
Test Suite
55+
----------
5656

5757
Regression testing scripts are available in the 'tests' directory:
5858

@@ -64,25 +64,10 @@ You have to allow 'ssh localhost' and 'ssh $HOSTNAME' without any warnings for
6464
"remote" tests to run as expected. $HOSTNAME should not be 127.0.0.1 nor ::1.
6565
Also some tests use the 'bc' command.
6666

67-
--------------
68-
Documentation
69-
-------------
70-
71-
Local API documentation is available, just type:
72-
73-
$ pydoc ClusterShell
74-
75-
Online API documentation (epydoc) is available here:
67+
ClusterShell interactively
68+
--------------------------
7669

77-
http://packages.python.org/ClusterShell/
78-
79-
--------------------------
80-
ClusterShell interactively
81-
--------------------------
82-
83-
Python 2.7.1 (r271:86832, Apr 12 2011, 16:15:16)
84-
[GCC 4.6.0 20110331 (Red Hat 4.6.0-2)] on linux2
85-
Type "help", "copyright", "credits" or "license" for more information.
70+
```python
8671
>>> from ClusterShell.Task import task_self
8772
>>> from ClusterShell.NodeSet import NodeSet
8873
>>> task = task_self()
@@ -94,32 +79,20 @@ Type "help", "copyright", "credits" or "license" for more information.
9479
linux[32-39] 2.6.40.6-0.fc15.x86_64
9580

9681
linux[4-6] 2.6.32-71.el6.x86_64
82+
```
9783

98-
------------------
99-
ClusterShell Tools
100-
------------------
101-
102-
Powerful tools are provided: clush, nodeset and clubak.
103-
104-
* clush is a friendly and full-featured parallel shell (see: man clush).
105-
If in doubt, just check if your other parallel tools can do things like:
106-
# tar -czf - dir | clush -w node[10-44] tar -C /tmp -xzvf -
107-
108-
* nodeset is used to deal with your cluster nodeset, it can be bound to
109-
external groups (see: man nodeset and man groups.conf).
84+
Links
85+
-----
11086

111-
* clubak is a tool used to format output from clush/pdsh-like output
112-
(already included in clush with -b), see man clubak.
113-
114-
-----
115-
Links
116-
-----
117-
118-
Main web site:
87+
Web site:
11988

12089
http://clustershell.sourceforge.net
12190
or http://cea-hpc.github.com/clustershell/
12291

92+
Online documentation:
93+
94+
http://clustershell.readthedocs.org/
95+
12396
Github source respository:
12497

12598
https://github.com/cea-hpc/clustershell
@@ -144,12 +117,12 @@ ClusterShell was born along with Shine, a scalable Lustre FS admin tool:
144117

145118
http://lustre-shine.sourceforge.net
146119

147-
-------
148-
Authors
149-
-------
120+
Core developers/reviewers
121+
-------------------------
150122

151-
Stephane Thiell <[email protected]>
152-
Aurelien Degremont <[email protected]>
153-
Henri Doreau <[email protected]>
123+
* Stephane Thiell
124+
* Aurelien Degremont
125+
* Henri Doreau
126+
* Dominique Martinet
154127

155128
CEA/DAM 2010, 2011, 2012, 2013, 2014, 2015 - http://www-hpc.cea.fr

clustershell.spec.in

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ rm -rf %{buildroot}
6868

6969
%files
7070
%defattr(-,root,root,-)
71-
%doc README ChangeLog Licence_CeCILL-C_V1-en.txt Licence_CeCILL-C_V1-fr.txt
71+
%doc README.md ChangeLog Licence_CeCILL-C_V1-en.txt Licence_CeCILL-C_V1-fr.txt
7272
%doc doc/examples
7373
%doc doc/sphinx
7474
%{_mandir}/man1/clubak.1*
@@ -101,6 +101,9 @@ rm -rf %{buildroot}
101101
%{vimdatadir}/syntax/groupsconf.vim
102102

103103
%changelog
104+
* Tue Nov 10 2015 Stephane Thiell <[email protected]> 1.7-1
105+
- update to 1.7
106+
104107
* Fri Aug 7 2015 Stephane Thiell <[email protected]> 1.6.96-1
105108
- update to 1.6.96
106109

doc/man/man1/clubak.1

Lines changed: 28 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
.\" Man page generated from reStructeredText.
1+
.\" Man page generated from reStructuredText.
22
.
3-
.TH CLUBAK 1 "2012-03-28" "1.6" "ClusterShell User Manual"
3+
.TH CLUBAK 1 "2015-11-05" "1.7" "ClusterShell User Manual"
44
.SH NAME
55
clubak \- format output from clush/pdsh-like output and more
66
.
@@ -32,87 +32,74 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
3232
..
3333
.SH SYNOPSIS
3434
.sp
35-
\fCclubak\fP [ OPTIONS ]
35+
\fBclubak\fP [ OPTIONS ]
3636
.SH DESCRIPTION
3737
.sp
38-
\fCclubak\fP formats text from standard input containing lines of the form
39-
"\fInode:output\fP". It is fully backward compatible with \fCdshbak\fP(1) but
40-
provides additonal features. For instance, \fCclubak\fP always displays
38+
\fBclubak\fP formats text from standard input containing lines of the form
39+
"\fInode:output\fP". It is fully backward compatible with \fBdshbak\fP(1) but
40+
provides additonal features. For instance, \fBclubak\fP always displays
4141
its results sorted by node/nodeset.
4242
.sp
43-
You do not need to use \fCclubak\fP when using \fCclush\fP(1) as all output
43+
You do not need to use \fBclubak\fP when using \fBclush\fP(1) as all output
4444
formatting features are already included in. It is provided for other usages,
4545
like post\-processing results of the form "\fInode:output\fP".
4646
.sp
47-
Like \fCclush\fP(1), \fCclubak\fP uses the \fIClusterShell.MsgTree\fP module of the
48-
ClusterShell library (see \fCpydoc ClusterShell.MsgTree\fP).
47+
Like \fBclush\fP(1), \fBclubak\fP uses the \fIClusterShell.MsgTree\fP module of the
48+
ClusterShell library (see \fBpydoc ClusterShell.MsgTree\fP).
4949
.SH INVOCATION
5050
.sp
51-
\fCclubak\fP should be started with connected standard input.
51+
\fBclubak\fP should be started with connected standard input.
5252
.SH OPTIONS
5353
.INDENT 0.0
5454
.TP
5555
.B \-\-version
56-
.
57-
show \fCclubak\fP version number and exit
56+
show \fBclubak\fP version number and exit
5857
.TP
59-
.B \-b, \-c
60-
.
61-
gather nodes with same output (\-c is provided for \fCdshbak\fP(1)
58+
.B \-b\fP,\fB \-c
59+
gather nodes with same output (\-c is provided for \fBdshbak\fP(1)
6260
compatibility)
6361
.TP
64-
.B \-d, \-\-debug
65-
.
62+
.B \-d\fP,\fB \-\-debug
6663
output more messages for debugging purpose
6764
.TP
6865
.B \-L
69-
.
7066
disable header block and order output by nodes
7167
.TP
72-
.B \-r, \-\-regroup
73-
.
68+
.B \-r\fP,\fB \-\-regroup
7469
fold nodeset using node groups
7570
.TP
76-
.BI \-s \ GROUPSOURCE, \ \-\-groupsource\fB= GROUPSOURCE
77-
.
78-
optional \fCgroups.conf\fP(5) group source to use
71+
.BI \-s \ GROUPSOURCE\fP,\fB \ \-\-groupsource\fB= GROUPSOURCE
72+
optional \fBgroups.conf\fP(5) group source to use
7973
.TP
80-
.B \-G, \-\-groupbase
81-
.
74+
.B \-G\fP,\fB \-\-groupbase
8275
do not display group source prefix (always \fI@groupname\fP)
8376
.TP
84-
.BI \-S \ SEPARATOR, \ \-\-separator\fB= SEPARATOR
85-
.
77+
.BI \-S \ SEPARATOR\fP,\fB \ \-\-separator\fB= SEPARATOR
8678
node / line content separator string (default: \fI:\fP)
8779
.TP
88-
.B \-F, \-\-fast
89-
.
80+
.B \-F\fP,\fB \-\-fast
9081
faster but memory hungry mode (preload all messages per node)
9182
.TP
92-
.B \-T, \-\-tree
93-
.
94-
message tree trace mode; switch to enable \fCClusterShell.MsgTree\fP trace mode, all keys/nodes being kept for each message element of the tree, thus allowing special output gathering
83+
.B \-T\fP,\fB \-\-tree
84+
message tree trace mode; switch to enable \fBClusterShell.MsgTree\fP trace mode, all keys/nodes being kept for each message element of the tree, thus allowing special output gathering
9585
.TP
9686
.BI \-\-color\fB= WHENCOLOR
97-
.
98-
whether to use ANSI colors to surround node or nodeset prefix/header with escape sequences to display them in color on the terminal. \fIWHENCOLOR\fP is \fCnever\fP, \fCalways\fP or \fCauto\fP (which use color if standard output refers to a terminal). Color is set to [34m (blue foreground text) and cannot be modified.
87+
whether to use ANSI colors to surround node or nodeset prefix/header with escape sequences to display them in color on the terminal. \fIWHENCOLOR\fP is \fBnever\fP, \fBalways\fP or \fBauto\fP (which use color if standard output refers to a terminal). Color is set to [34m (blue foreground text) and cannot be modified.
9988
.TP
10089
.B \-\-diff
101-
.
10290
show diff between gathered outputs
10391
.UNINDENT
10492
.SH EXIT STATUS
10593
.sp
106-
An exit status of zero indicates success of the \fCclubak\fP command.
94+
An exit status of zero indicates success of the \fBclubak\fP command.
10795
.SH EXAMPLES
10896
.INDENT 0.0
10997
.IP 1. 3
110-
.
111-
\fCclubak\fP can be used to gather some recorded \fCclush\fP(1) results:
98+
\fBclubak\fP can be used to gather some recorded \fBclush\fP(1) results:
11299
.UNINDENT
113100
.INDENT 0.0
114101
.TP
115-
.B Record \fCclush\fP(1) results in a file:
102+
.B Record \fBclush\fP(1) results in a file:
116103
.nf
117104
# clush \-w node[1\-7] uname \-r >/tmp/clush_output
118105
# clush \-w node[32\-159] uname \-r >>/tmp/clush_output
@@ -127,7 +114,6 @@ An exit status of zero indicates success of the \fCclubak\fP command.
127114
.UNINDENT
128115
.INDENT 0.0
129116
.IP 2. 3
130-
.
131117
Another example, iterate over \fInode*\fP text files in current directory and gather characters count for all of them:
132118
.INDENT 3.0
133119
.INDENT 3.5
@@ -142,18 +128,16 @@ node2: 9
142128
.UNINDENT
143129
.SH SEE ALSO
144130
.sp
145-
\fCclush\fP(1), \fCnodeset\fP(1), \fCgroups.conf\fP(5).
131+
\fBclush\fP(1), \fBnodeset\fP(1), \fBgroups.conf\fP(5).
146132
.SH BUG REPORTS
147133
.INDENT 0.0
148134
.TP
149135
.B Use the following URL to submit a bug report or feedback:
150-
.
151136
\fI\%https://github.com/cea\-hpc/clustershell/issues\fP
152137
.UNINDENT
153138
.SH AUTHOR
154-
Stephane Thiell, CEA DAM <[email protected]>
139+
Stephane Thiell <[email protected]>
155140
.SH COPYRIGHT
156141
CeCILL-C V1
157142
.\" Generated by docutils manpage writer.
158-
.\"
159143
.

doc/man/man1/nodeset.1

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.\" Man page generated from reStructuredText.
22
.
3-
.TH NODESET 1 "2015-08-29" "1.7" "ClusterShell User Manual"
3+
.TH NODESET 1 "2015-11-05" "1.7" "ClusterShell User Manual"
44
.SH NAME
55
nodeset \- compute advanced nodeset operations
66
.
@@ -123,6 +123,9 @@ hide group source prefix (always \fI@groupname\fP)
123123
separator string to use when expanding nodesets
124124
(default: \(aq \(aq)
125125
.TP
126+
.BI \-O \ FORMAT\fP,\fB \ \-\-output\-format\fB= FORMAT
127+
output format (default: \(aq%s\(aq)
128+
.TP
126129
.BI \-I \ SLICE_RANGESET\fP,\fB \ \-\-slice\fB= SLICE_RANGESET
127130
return sliced off result; examples of SLICE_RANGESET are "0" for simple index selection, or "1\-9/2,16" for complex rangeset selection
128131
.TP

doc/sphinx/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
# The short X.Y version.
5151
version = '1.7'
5252
# The full version, including alpha/beta/rc tags.
53-
release = '1.7-devel'
53+
release = '1.7'
5454

5555
# The language for content autogenerated by Sphinx. Refer to documentation
5656
# for a list of supported languages.

doc/txt/clubak.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
format output from clush/pdsh-like output and more
77
--------------------------------------------------
88

9-
:Author: Stephane Thiell, CEA DAM <[email protected]>
10-
:Date: 2012-03-28
9+
:Author: Stephane Thiell <[email protected]>
10+
:Date: 2015-11-05
1111
:Copyright: CeCILL-C V1
12-
:Version: 1.6
12+
:Version: 1.7
1313
:Manual section: 1
1414
:Manual group: ClusterShell User Manual
1515

0 commit comments

Comments
 (0)