Skip to content

Commit 974fca9

Browse files
authored
Merge pull request #1175 from dstufft/drop-2.6
Drop support for Python 2.6
2 parents 2f5c75b + 73404cb commit 974fca9

10 files changed

+11
-31
lines changed

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ language: python
33
matrix:
44
include:
55
# Based on https://docs.python.org/devguide/#status-of-python-branches
6-
- python: 2.6
7-
env: TOXENV=python2.6
86
- python: 2.7
97
env: TOXENV=python2.7
108
- python: 3.4

appveyor.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@ environment:
44
# For Python versions available on Appveyor, see
55
# http://www.appveyor.com/docs/installed-software#python
66

7-
- PYTHON: "C:\\Python26"
87
- PYTHON: "C:\\Python27"
98
- PYTHON: "C:\\Python34"
109
- PYTHON: "C:\\Python35"
1110
- PYTHON: "C:\\Python36"
12-
- PYTHON: "C:\\Python26-x64"
1311
- PYTHON: "C:\\Python27-x64"
1412
- PYTHON: "C:\\Python34-x64"
1513
- PYTHON: "C:\\Python35-x64"

docs/changes.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
Release History
22
===============
33

4-
15.3.0 (unreleased)
4+
16.0.0 (unreleased)
55
-------------------
66

7+
* Drop support for Python 2.6.
8+
79

810
15.2.0 (2018-03-21)
911
-------------------

docs/index.rst

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,6 @@ doesn't access the globally installed libraries either).
4545
development
4646
changes
4747

48-
.. warning::
49-
50-
Python bugfix releases 2.6.8, 2.7.3, 3.1.5 and 3.2.3 include a change that
51-
will cause "import random" to fail with "cannot import name urandom" on any
52-
virtualenv created on a Unix host with an earlier release of Python
53-
2.6/2.7/3.1/3.2, if the underlying system Python is upgraded. This is due to
54-
the fact that a virtualenv uses the system Python's standard library but
55-
contains its own copy of the Python interpreter, so an upgrade to the system
56-
Python results in a mismatch between the version of the Python interpreter
57-
and the version of the standard library. It can be fixed by removing
58-
``$ENV/bin/python`` and re-running virtualenv on the same target directory
59-
with the upgraded Python.
6048

6149
Other Documentation and Links
6250
-----------------------------

setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import shutil
44
import sys
55

6-
if sys.version_info[:2] < (2, 6):
7-
sys.exit('virtualenv requires Python 2.6 or higher.')
6+
if sys.version_info[:2] < (2, 7):
7+
sys.exit('virtualenv requires Python 2.7 or higher.')
88

99
try:
1010
from setuptools import setup
@@ -103,7 +103,6 @@ def get_version():
103103
'Intended Audience :: Developers',
104104
'License :: OSI Approved :: MIT License',
105105
'Programming Language :: Python :: 2',
106-
'Programming Language :: Python :: 2.6',
107106
'Programming Language :: Python :: 2.7',
108107
'Programming Language :: Python :: 3',
109108
'Programming Language :: Python :: 3.4',
@@ -120,4 +119,5 @@ def get_version():
120119
py_modules=['virtualenv'],
121120
packages=['virtualenv_support'],
122121
package_data={'virtualenv_support': ['*.whl']},
122+
python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*',
123123
**setup_params)

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# env names must be a valid python binary name, unless they have a
33
# separate configuration
44
envlist =
5-
python{2.6,2.7,3.4,3.5,3.6}, pypy{,3}, crosspython{2,3}, docs
5+
python{2.7,3.4,3.5,3.6}, pypy{,3}, crosspython{2,3}, docs
66

77
[testenv]
88
deps =

virtualenv.py

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
__version__ = "15.3.0.dev0"
4141
virtualenv_version = __version__ # legacy
4242

43-
if sys.version_info < (2, 6):
43+
if sys.version_info < (2, 7):
4444
print('ERROR: %s' % sys.exc_info()[1])
45-
print('ERROR: this script requires Python 2.6 or greater.')
45+
print('ERROR: this script requires Python 2.7 or greater.')
4646
sys.exit(101)
4747

4848
try:
@@ -931,19 +931,13 @@ def create_environment(home_dir, site_packages=False, clear=False,
931931
to_install = []
932932

933933
if not no_setuptools:
934-
if sys.version_info[:2] == (2, 6):
935-
to_install.append('setuptools<37')
936-
else:
937-
to_install.append('setuptools')
934+
to_install.append('setuptools')
938935

939936
if not no_pip:
940937
to_install.append('pip')
941938

942939
if not no_wheel:
943-
if sys.version_info[:2] == (2, 6):
944-
to_install.append("wheel<0.30")
945-
else:
946-
to_install.append('wheel')
940+
to_install.append('wheel')
947941

948942
if to_install:
949943
install_wheel(
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)