Skip to content

Commit d1d66de

Browse files
giovtorresgiovtorres
committed
Merge 19.05 branch into master
2 parents 3636e74 + aa0387f commit d1d66de

31 files changed

+1625
-1959
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,6 @@ tests/*.pyc
3131
# Source distribution files
3232
dist
3333
pyslurm.egg-info
34+
35+
# IDE files
36+
.vscode

‎.travis.yml‎

Lines changed: 14 additions & 145 deletions
Original file line numberDiff line numberDiff line change
@@ -2,154 +2,23 @@ sudo: required
22
language: python
33
env:
44
matrix:
5-
- SLURM=17.11.0 CYTHON=0.27.3 CENTOS=7 PYTHON=3.6
6-
- SLURM=17.11.0 CYTHON=0.27.3 CENTOS=7 PYTHON=3.5
7-
- SLURM=17.11.0 CYTHON=0.27.3 CENTOS=7 PYTHON=3.4
8-
- SLURM=17.11.0 CYTHON=0.27.3 CENTOS=7 PYTHON=2.7
9-
- SLURM=17.11.0 CYTHON=0.27.3 CENTOS=6 PYTHON=2.6
10-
- SLURM=17.11.0 CYTHON=0.19.2 CENTOS=7 PYTHON=3.6
11-
- SLURM=17.11.0 CYTHON=0.19.2 CENTOS=7 PYTHON=3.5
12-
- SLURM=17.11.0 CYTHON=0.19.2 CENTOS=7 PYTHON=3.4
13-
- SLURM=17.11.0 CYTHON=0.19.2 CENTOS=7 PYTHON=2.7
14-
- SLURM=17.11.0 CYTHON=0.19.2 CENTOS=6 PYTHON=2.6
15-
- SLURM=17.11.0 CYTHON=0.15.1 CENTOS=7 PYTHON=2.7
16-
- SLURM=17.11.1 CYTHON=0.27.3 CENTOS=7 PYTHON=3.6
17-
- SLURM=17.11.1 CYTHON=0.27.3 CENTOS=7 PYTHON=3.5
18-
- SLURM=17.11.1 CYTHON=0.27.3 CENTOS=7 PYTHON=3.4
19-
- SLURM=17.11.1 CYTHON=0.27.3 CENTOS=7 PYTHON=2.7
20-
- SLURM=17.11.1 CYTHON=0.27.3 CENTOS=6 PYTHON=2.6
21-
- SLURM=17.11.1 CYTHON=0.19.2 CENTOS=7 PYTHON=3.6
22-
- SLURM=17.11.1 CYTHON=0.19.2 CENTOS=7 PYTHON=3.5
23-
- SLURM=17.11.1 CYTHON=0.19.2 CENTOS=7 PYTHON=3.4
24-
- SLURM=17.11.1 CYTHON=0.19.2 CENTOS=7 PYTHON=2.7
25-
- SLURM=17.11.1 CYTHON=0.19.2 CENTOS=6 PYTHON=2.6
26-
- SLURM=17.11.1 CYTHON=0.15.1 CENTOS=7 PYTHON=2.7
27-
- SLURM=17.11.2 CYTHON=0.27.3 CENTOS=7 PYTHON=3.6
28-
- SLURM=17.11.2 CYTHON=0.27.3 CENTOS=7 PYTHON=3.5
29-
- SLURM=17.11.2 CYTHON=0.27.3 CENTOS=7 PYTHON=3.4
30-
- SLURM=17.11.2 CYTHON=0.27.3 CENTOS=7 PYTHON=2.7
31-
- SLURM=17.11.2 CYTHON=0.27.3 CENTOS=6 PYTHON=2.6
32-
- SLURM=17.11.2 CYTHON=0.19.2 CENTOS=7 PYTHON=3.6
33-
- SLURM=17.11.2 CYTHON=0.19.2 CENTOS=7 PYTHON=3.5
34-
- SLURM=17.11.2 CYTHON=0.19.2 CENTOS=7 PYTHON=3.4
35-
- SLURM=17.11.2 CYTHON=0.19.2 CENTOS=7 PYTHON=2.7
36-
- SLURM=17.11.2 CYTHON=0.19.2 CENTOS=6 PYTHON=2.6
37-
- SLURM=17.11.2 CYTHON=0.15.1 CENTOS=7 PYTHON=2.7
38-
- SLURM=17.11.3 CYTHON=0.27.3 CENTOS=7 PYTHON=3.6
39-
- SLURM=17.11.3 CYTHON=0.27.3 CENTOS=7 PYTHON=3.5
40-
- SLURM=17.11.3 CYTHON=0.27.3 CENTOS=7 PYTHON=3.4
41-
- SLURM=17.11.3 CYTHON=0.27.3 CENTOS=7 PYTHON=2.7
42-
- SLURM=17.11.3 CYTHON=0.27.3 CENTOS=6 PYTHON=2.6
43-
- SLURM=17.11.3 CYTHON=0.19.2 CENTOS=7 PYTHON=3.6
44-
- SLURM=17.11.3 CYTHON=0.19.2 CENTOS=7 PYTHON=3.5
45-
- SLURM=17.11.3 CYTHON=0.19.2 CENTOS=7 PYTHON=3.4
46-
- SLURM=17.11.3 CYTHON=0.19.2 CENTOS=7 PYTHON=2.7
47-
- SLURM=17.11.3 CYTHON=0.19.2 CENTOS=6 PYTHON=2.6
48-
- SLURM=17.11.3 CYTHON=0.15.1 CENTOS=7 PYTHON=2.7
49-
- SLURM=17.11.5 CYTHON=0.27.3 CENTOS=7 PYTHON=3.6
50-
- SLURM=17.11.5 CYTHON=0.27.3 CENTOS=7 PYTHON=3.5
51-
- SLURM=17.11.5 CYTHON=0.27.3 CENTOS=7 PYTHON=3.4
52-
- SLURM=17.11.5 CYTHON=0.27.3 CENTOS=7 PYTHON=2.7
53-
- SLURM=17.11.5 CYTHON=0.27.3 CENTOS=6 PYTHON=2.6
54-
- SLURM=17.11.5 CYTHON=0.19.2 CENTOS=7 PYTHON=3.6
55-
- SLURM=17.11.5 CYTHON=0.19.2 CENTOS=7 PYTHON=3.5
56-
- SLURM=17.11.5 CYTHON=0.19.2 CENTOS=7 PYTHON=3.4
57-
- SLURM=17.11.5 CYTHON=0.19.2 CENTOS=7 PYTHON=2.7
58-
- SLURM=17.11.5 CYTHON=0.19.2 CENTOS=6 PYTHON=2.6
59-
- SLURM=17.11.5 CYTHON=0.15.1 CENTOS=7 PYTHON=2.7
60-
- SLURM=17.11.6 CYTHON=0.27.3 CENTOS=7 PYTHON=3.6
61-
- SLURM=17.11.6 CYTHON=0.27.3 CENTOS=7 PYTHON=3.5
62-
- SLURM=17.11.6 CYTHON=0.27.3 CENTOS=7 PYTHON=3.4
63-
- SLURM=17.11.6 CYTHON=0.27.3 CENTOS=7 PYTHON=2.7
64-
- SLURM=17.11.6 CYTHON=0.27.3 CENTOS=6 PYTHON=2.6
65-
- SLURM=17.11.6 CYTHON=0.19.2 CENTOS=7 PYTHON=3.6
66-
- SLURM=17.11.6 CYTHON=0.19.2 CENTOS=7 PYTHON=3.5
67-
- SLURM=17.11.6 CYTHON=0.19.2 CENTOS=7 PYTHON=3.4
68-
- SLURM=17.11.6 CYTHON=0.19.2 CENTOS=7 PYTHON=2.7
69-
- SLURM=17.11.6 CYTHON=0.19.2 CENTOS=6 PYTHON=2.6
70-
- SLURM=17.11.6 CYTHON=0.15.1 CENTOS=7 PYTHON=2.7
71-
- SLURM=17.11.7 CYTHON=0.27.3 CENTOS=7 PYTHON=3.6
72-
- SLURM=17.11.7 CYTHON=0.27.3 CENTOS=7 PYTHON=3.5
73-
- SLURM=17.11.7 CYTHON=0.27.3 CENTOS=7 PYTHON=3.4
74-
- SLURM=17.11.7 CYTHON=0.27.3 CENTOS=7 PYTHON=2.7
75-
- SLURM=17.11.7 CYTHON=0.27.3 CENTOS=6 PYTHON=2.6
76-
- SLURM=17.11.7 CYTHON=0.19.2 CENTOS=7 PYTHON=3.6
77-
- SLURM=17.11.7 CYTHON=0.19.2 CENTOS=7 PYTHON=3.5
78-
- SLURM=17.11.7 CYTHON=0.19.2 CENTOS=7 PYTHON=3.4
79-
- SLURM=17.11.7 CYTHON=0.19.2 CENTOS=7 PYTHON=2.7
80-
- SLURM=17.11.7 CYTHON=0.19.2 CENTOS=6 PYTHON=2.6
81-
- SLURM=17.11.7 CYTHON=0.15.1 CENTOS=7 PYTHON=2.7
82-
- SLURM=17.11.8 CYTHON=0.27.3 CENTOS=7 PYTHON=3.6
83-
- SLURM=17.11.8 CYTHON=0.27.3 CENTOS=7 PYTHON=3.5
84-
- SLURM=17.11.8 CYTHON=0.27.3 CENTOS=7 PYTHON=3.4
85-
- SLURM=17.11.8 CYTHON=0.27.3 CENTOS=7 PYTHON=2.7
86-
- SLURM=17.11.8 CYTHON=0.27.3 CENTOS=6 PYTHON=2.6
87-
- SLURM=17.11.8 CYTHON=0.19.2 CENTOS=7 PYTHON=3.6
88-
- SLURM=17.11.8 CYTHON=0.19.2 CENTOS=7 PYTHON=3.5
89-
- SLURM=17.11.8 CYTHON=0.19.2 CENTOS=7 PYTHON=3.4
90-
- SLURM=17.11.8 CYTHON=0.19.2 CENTOS=7 PYTHON=2.7
91-
- SLURM=17.11.8 CYTHON=0.19.2 CENTOS=6 PYTHON=2.6
92-
- SLURM=17.11.8 CYTHON=0.15.1 CENTOS=7 PYTHON=2.7
93-
- SLURM=17.11.9 CYTHON=0.27.3 CENTOS=7 PYTHON=3.6
94-
- SLURM=17.11.9 CYTHON=0.27.3 CENTOS=7 PYTHON=3.5
95-
- SLURM=17.11.9 CYTHON=0.27.3 CENTOS=7 PYTHON=3.4
96-
- SLURM=17.11.9 CYTHON=0.27.3 CENTOS=7 PYTHON=2.7
97-
- SLURM=17.11.9 CYTHON=0.27.3 CENTOS=6 PYTHON=2.6
98-
- SLURM=17.11.9 CYTHON=0.19.2 CENTOS=7 PYTHON=3.6
99-
- SLURM=17.11.9 CYTHON=0.19.2 CENTOS=7 PYTHON=3.5
100-
- SLURM=17.11.9 CYTHON=0.19.2 CENTOS=7 PYTHON=3.4
101-
- SLURM=17.11.9 CYTHON=0.19.2 CENTOS=7 PYTHON=2.7
102-
- SLURM=17.11.9 CYTHON=0.19.2 CENTOS=6 PYTHON=2.6
103-
- SLURM=17.11.9 CYTHON=0.15.1 CENTOS=7 PYTHON=2.7
104-
- SLURM=17.11.10 CYTHON=0.27.3 CENTOS=7 PYTHON=3.6
105-
- SLURM=17.11.10 CYTHON=0.27.3 CENTOS=7 PYTHON=3.5
106-
- SLURM=17.11.10 CYTHON=0.27.3 CENTOS=7 PYTHON=3.4
107-
- SLURM=17.11.10 CYTHON=0.27.3 CENTOS=7 PYTHON=2.7
108-
- SLURM=17.11.10 CYTHON=0.27.3 CENTOS=6 PYTHON=2.6
109-
- SLURM=17.11.10 CYTHON=0.19.2 CENTOS=7 PYTHON=3.6
110-
- SLURM=17.11.10 CYTHON=0.19.2 CENTOS=7 PYTHON=3.5
111-
- SLURM=17.11.10 CYTHON=0.19.2 CENTOS=7 PYTHON=3.4
112-
- SLURM=17.11.10 CYTHON=0.19.2 CENTOS=7 PYTHON=2.7
113-
- SLURM=17.11.10 CYTHON=0.19.2 CENTOS=6 PYTHON=2.6
114-
- SLURM=17.11.10 CYTHON=0.15.1 CENTOS=7 PYTHON=2.7
115-
- SLURM=17.11.11 CYTHON=0.27.3 CENTOS=7 PYTHON=3.6
116-
- SLURM=17.11.11 CYTHON=0.27.3 CENTOS=7 PYTHON=3.5
117-
- SLURM=17.11.11 CYTHON=0.27.3 CENTOS=7 PYTHON=3.4
118-
- SLURM=17.11.11 CYTHON=0.27.3 CENTOS=7 PYTHON=2.7
119-
- SLURM=17.11.11 CYTHON=0.27.3 CENTOS=6 PYTHON=2.6
120-
- SLURM=17.11.11 CYTHON=0.19.2 CENTOS=7 PYTHON=3.6
121-
- SLURM=17.11.11 CYTHON=0.19.2 CENTOS=7 PYTHON=3.5
122-
- SLURM=17.11.11 CYTHON=0.19.2 CENTOS=7 PYTHON=3.4
123-
- SLURM=17.11.11 CYTHON=0.19.2 CENTOS=7 PYTHON=2.7
124-
- SLURM=17.11.11 CYTHON=0.19.2 CENTOS=6 PYTHON=2.6
125-
- SLURM=17.11.11 CYTHON=0.15.1 CENTOS=7 PYTHON=2.7
126-
- SLURM=17.11.12 CYTHON=0.27.3 CENTOS=7 PYTHON=3.6
127-
- SLURM=17.11.12 CYTHON=0.27.3 CENTOS=7 PYTHON=3.5
128-
- SLURM=17.11.12 CYTHON=0.27.3 CENTOS=7 PYTHON=3.4
129-
- SLURM=17.11.12 CYTHON=0.27.3 CENTOS=7 PYTHON=2.7
130-
- SLURM=17.11.12 CYTHON=0.27.3 CENTOS=6 PYTHON=2.6
131-
- SLURM=17.11.12 CYTHON=0.19.2 CENTOS=7 PYTHON=3.6
132-
- SLURM=17.11.12 CYTHON=0.19.2 CENTOS=7 PYTHON=3.5
133-
- SLURM=17.11.12 CYTHON=0.19.2 CENTOS=7 PYTHON=3.4
134-
- SLURM=17.11.12 CYTHON=0.19.2 CENTOS=7 PYTHON=2.7
135-
- SLURM=17.11.12 CYTHON=0.19.2 CENTOS=6 PYTHON=2.6
136-
- SLURM=17.11.12 CYTHON=0.15.1 CENTOS=7 PYTHON=2.7
137-
- SLURM=17.11.13 CYTHON=0.27.3 CENTOS=7 PYTHON=3.6
138-
- SLURM=17.11.13 CYTHON=0.27.3 CENTOS=7 PYTHON=3.5
139-
- SLURM=17.11.13 CYTHON=0.27.3 CENTOS=7 PYTHON=3.4
140-
- SLURM=17.11.13 CYTHON=0.27.3 CENTOS=7 PYTHON=2.7
141-
- SLURM=17.11.13 CYTHON=0.27.3 CENTOS=6 PYTHON=2.6
142-
- SLURM=17.11.13 CYTHON=0.19.2 CENTOS=7 PYTHON=3.6
143-
- SLURM=17.11.13 CYTHON=0.19.2 CENTOS=7 PYTHON=3.5
144-
- SLURM=17.11.13 CYTHON=0.19.2 CENTOS=7 PYTHON=3.4
145-
- SLURM=17.11.13 CYTHON=0.19.2 CENTOS=7 PYTHON=2.7
146-
- SLURM=17.11.13 CYTHON=0.19.2 CENTOS=6 PYTHON=2.6
147-
- SLURM=17.11.13 CYTHON=0.15.1 CENTOS=7 PYTHON=2.7
5+
- SLURM=19.05.0 CYTHON=0.29.6 PYTHON=3.6
6+
- SLURM=19.05.0 CYTHON=0.29.6 PYTHON=3.5
7+
- SLURM=19.05.0 CYTHON=0.29.6 PYTHON=3.4
8+
- SLURM=19.05.0 CYTHON=0.29.6 PYTHON=2.7
9+
- SLURM=19.05.0 CYTHON=0.29.6 PYTHON=2.6
10+
- SLURM=19.05.0 CYTHON=0.19.2 PYTHON=3.6
11+
- SLURM=19.05.0 CYTHON=0.19.2 PYTHON=3.5
12+
- SLURM=19.05.0 CYTHON=0.19.2 PYTHON=3.4
13+
- SLURM=19.05.0 CYTHON=0.19.2 PYTHON=2.7
14+
- SLURM=19.05.0 CYTHON=0.19.2 PYTHON=2.6
15+
- SLURM=19.05.0 CYTHON=0.15.1 PYTHON=2.7
16+
- SLURM=19.05.0 CYTHON=0.15.1 PYTHON=2.6
14817
services:
14918
- docker
15019
before_install:
151-
- docker pull giovtorres/docker-centos$CENTOS-slurm:$SLURM
152-
- docker run -d -it -h ernie --name slurm-$SLURM giovtorres/docker-centos$CENTOS-slurm:$SLURM
20+
- docker pull giovtorres/docker-centos7-slurm:$SLURM
21+
- docker run -d -it -h ernie --name slurm-$SLURM giovtorres/docker-centos7-slurm:$SLURM
15322
install: true
15423
before_script:
15524
- docker exec slurm-$SLURM git clone --branch=$TRAVIS_BRANCH https://github.com/PySlurm/pyslurm.git

‎MANIFEST.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ include pyslurm/alps_cray.h
22
include pyslurm/bluegene.pxi
33
include pyslurm/slurm_defines.pxi
44
include pyslurm/slurm.pxd
5+
include pyslurm/xmalloc.h
56
include README.rst
67
include CONTRIBUTORS.rst
78
include COPYING.txt

‎README.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
PySlurm: Slurm Interface for Python
33
***********************************
44

5-
.. image:: https://travis-ci.org/PySlurm/pyslurm.svg?branch=master
5+
.. image:: https://travis-ci.org/PySlurm/pyslurm.svg?branch=19.05.0
66
:target: https://travis-ci.org/PySlurm/pyslurm
77

88
Overview
@@ -11,7 +11,7 @@ Overview
1111
Currently PySlurm is under development to move from it's thin layer on top of
1212
the Slurm C API to an object orientated interface.
1313

14-
This release is based on Slurm 17.11. For Slurm 18.08, please see the `18.08.0 branch <https://github.com/PySlurm/pyslurm/tree/18.08.0>`_.
14+
This release is based on Slurm 19.05.
1515

1616
Prerequisites
1717
*************
@@ -24,14 +24,14 @@ This PySlurm branch has been tested with:
2424

2525
* Cython 0.15.1*, 0.19.2, and the latest stable
2626
* Python 2.6, 2.7, and 3.4
27-
* Slurm 17.11.0 thru 17.11.13
27+
* Slurm 19.05.0
2828

2929
Note: Cython 0.15.1 is only tested on Python 2.7.
3030

3131
Installation
3232
************
3333

34-
You will need to instruct the setup.py script where either the Slurm install root
34+
You will need to instruct the setup.py script where either the Slurm install root
3535
directory or where the Slurm libraries and Slurm include files are :
3636

3737
#. Slurm default directory (/usr):

‎debian/README.Debian‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎debian/README.source‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎debian/changelog‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎debian/compat‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎debian/control‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎debian/copyright‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)