diff --git a/.travis.yml b/.travis.yml index d783ed71..d78bb253 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/README.rst b/README.rst index ab09ae5c..7c56036d 100644 --- a/README.rst +++ b/README.rst @@ -18,12 +18,12 @@ Prerequisites * `Slurm `_ * `Python `_ -* `Cython `_ +* `Cython `_ 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. @@ -31,8 +31,8 @@ This PySlurm branch has been tested with: 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): diff --git a/setup.py b/setup.py index 6050f943..b7d4920d 100644 --- a/setup.py +++ b/setup.py @@ -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: @@ -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',