Skip to content

Commit 0b15954

Browse files
committed
Drop python 2.6 support
1 parent 2ae0923 commit 0b15954

File tree

4 files changed

+2
-12
lines changed

4 files changed

+2
-12
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ before_install:
3232
- cd ..
3333
- pip install coverage coveralls
3434
- if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then pip install pylint yapf; fi
35-
- if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2; fi
3635
- |
3736
if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then
3837
sudo apt-get install -y nodejs;

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ invalid IP address or an IPv6 address in an IPv4 database.
8585
Requirements
8686
------------
8787

88-
This code requires Python 2.6+ or 3.3+. The C extension requires CPython. The
88+
This code requires Python 2.7+ or 3.3+. The C extension requires CPython. The
8989
pure Python implementation has been tested with PyPy.
9090

9191
On Python 2, the `ipaddress module <https://pypi.python.org/pypi/ipaddress>`_ is

setup.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@
3737
# Cargo cult code for installing extension with pure Python fallback.
3838
# Taken from SQLAlchemy, but this same basic code exists in many modules.
3939
ext_errors = (CCompilerError, DistutilsExecError, DistutilsPlatformError)
40-
if sys.platform == 'win32':
41-
# 2.6's distutils.msvc9compiler can raise an IOError when failing to
42-
# find the compiler
43-
ext_errors += (IOError, )
44-
4540

4641
class BuildFailed(Exception):
4742
def __init__(self):
@@ -141,7 +136,6 @@ def run_setup(with_cext):
141136
'Intended Audience :: Developers',
142137
'Intended Audience :: System Administrators',
143138
'License :: OSI Approved :: Apache Software License',
144-
'Programming Language :: Python :: 2.6',
145139
'Programming Language :: Python :: 2.7',
146140
'Programming Language :: Python :: 3',
147141
'Programming Language :: Python :: 3.3',

tests/decoder_test.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99
from maxminddb.compat import byte_from_int, int_from_byte
1010
from maxminddb.decoder import Decoder
1111

12-
if sys.version_info[:2] == (2, 6):
13-
import unittest2 as unittest
14-
else:
15-
import unittest
12+
import unittest
1613

1714
if sys.version_info[0] == 2:
1815
unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp

0 commit comments

Comments
 (0)