Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,11 @@ env:
- SLURM=19.05.0 CYTHON=0.29.6 PYTHON=3.5
- SLURM=19.05.0 CYTHON=0.29.6 PYTHON=3.4
- SLURM=19.05.0 CYTHON=0.29.6 PYTHON=2.7
- SLURM=19.05.0 CYTHON=0.29.6 PYTHON=2.6
- SLURM=19.05.0 CYTHON=0.19.2 PYTHON=3.6
- SLURM=19.05.0 CYTHON=0.19.2 PYTHON=3.5
- SLURM=19.05.0 CYTHON=0.19.2 PYTHON=3.4
- SLURM=19.05.0 CYTHON=0.19.2 PYTHON=2.7
- SLURM=19.05.0 CYTHON=0.19.2 PYTHON=2.6
- SLURM=19.05.0 CYTHON=0.15.1 PYTHON=2.7
- SLURM=19.05.0 CYTHON=0.15.1 PYTHON=2.6
services:
- docker
before_install:
Expand Down
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@ Prerequisites

* `Slurm <https://www.schedmd.com>`_
* `Python <https://www.python.org>`_
* `Cython <http://cython.org>`_
* `Cython <https://cython.org>`_

This PySlurm branch has been tested with:

* Cython 0.15.1*, 0.19.2, and the latest stable
* Python 2.6, 2.7, and 3.4
* Python 2.7, 3.4, 3.5 and 3.6
* Slurm 19.05.0

Note: Cython 0.15.1 is only tested on Python 2.7.

Installation
************

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

#. Slurm default directory (/usr):

Expand Down
7 changes: 3 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ def info(logstring):
info("Cython version %s installed" % cython_version)
fatal("Please use Cython version >= %s" % CYTHON_VERSION_MIN)
except:
fatal("Cython (http://cython.org) is required to build PySlurm")
fatal("Cython (https://cython.org) is required to build PySlurm")
fatal("Please use Cython version >= %s" % CYTHON_VERSION_MIN)

if sys.version_info[:2] < (2, 6) or (3, 0) <= sys.version_info[:2] < (3, 4):
fatal("Python >= 2.6 or >= 3.4 is required to run PySlurm.")
if sys.version_info[:2] < (2, 7) or (3, 0) <= sys.version_info[:2] < (3, 4):
fatal("Python == 2.7 or >= 3.4 is required to run PySlurm.")


class Pyslurm:
Expand Down Expand Up @@ -328,7 +328,6 @@ def setup_package(self):
'Programming Language :: Cython',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
Expand Down