Skip to content

Commit 93b7bda

Browse files
committed
Drop support for Python 2.6.
😢 Add warning if trying to run setup.py on older Python's as suggested by @peterjc.
1 parent 358a42c commit 93b7bda

File tree

5 files changed

+8
-12
lines changed

5 files changed

+8
-12
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ env:
55
- TOX_ENV=py27-lint
66
- TOX_ENV=py34-lint
77
- TOX_ENV=py27-lint-readme
8-
- TOX_ENV=py26
98
- TOX_ENV=py27
109
- TOX_ENV=py34
1110

CONTRIBUTING.rst

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ Before you submit a pull request, check that it meets these guidelines:
106106

107107
1. If the pull request adds functionality, the docs should be updated. Put
108108
your new functionality into a function with a docstring.
109-
2. The pull request should work for Python 2.6 and 2.7. Check
109+
2. The pull request should work for Python 2.7 and 3.4. Check
110110
https://travis-ci.org/galaxyproject/planemo/pull_requests
111111
and make sure that the tests pass for all supported Python versions.
112112

@@ -118,7 +118,7 @@ To run a subset of tests::
118118
% make tox ENV=py27 ARGS='--tests tests/test_shed_upload.py'
119119

120120
This will use Tox_ to run the specified tests using Python 2.7. ``ENV`` here
121-
can be used to specify different Python version (e.g. ``py26``, ``py27``,
121+
can be used to specify different Python version (e.g. ``py27`` and
122122
``py34``). Python 3.4 is a work in progress.
123123

124124
Even more granularity is also possible by specifying specific test methods.::
@@ -157,9 +157,6 @@ testing environment. Planemo defines the following environments:
157157
``py27-lint-readme``
158158
Lint the README reStructuredText.
159159

160-
``py26``
161-
Run planemo tests in Python 2.6.
162-
163160
``py27``
164161
Run planemo tests in Python 2.7.
165162

dev-requirements.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ sphinx
1212
# Used to check readme.
1313
readme
1414

15-
# For Python 2.6 tests
16-
unittest2
17-
1815
# Used for code checking.
1916
pyflakes
2017
flake8

setup.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@
44
import ast
55
import os
66
import re
7+
import sys
78
try:
89
from setuptools import setup
910
except ImportError:
1011
from distutils.core import setup
1112

13+
if sys.version_info < (2, 7):
14+
sys.stderr.write("ERROR: planemo requires at least Python Version 2.7\n")
15+
sys.exit(1)
16+
1217
SOURCE_DIR = "planemo"
1318

1419
_version_re = re.compile(r'__version__\s+=\s+(.*)')
@@ -114,7 +119,6 @@ def get_var(var_name):
114119
'Topic :: Software Development :: Testing',
115120
'Natural Language :: English',
116121
"Programming Language :: Python :: 2",
117-
'Programming Language :: Python :: 2.6',
118122
'Programming Language :: Python :: 2.7',
119123
],
120124
test_suite=TEST_DIR,

tox.ini

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# TODO: py34 to envlist
22
# TODO: implement doc linting
33
[tox]
4-
envlist = py34-lint, py27-lint, py27-lint-readme, py26, py27
4+
envlist = py34-lint, py27-lint, py27-lint-readme, py27
55
source_dir = planemo
66
test_dir = tests
77

@@ -11,7 +11,6 @@ commands = {envpython} setup.py nosetests []
1111
deps =
1212
-rrequirements.txt
1313
py27: cwltool
14-
py26: unittest2
1514
nose
1615
coverage
1716
flask

0 commit comments

Comments
 (0)