Skip to content

Commit ad69357

Browse files
committed
Drop Python 2.6 support
There is probably some code cleanup that could be done, but it probably isn't worth doing that now. When we eventually drop 2.7 support, we can make everything more modern.
1 parent 9b66889 commit ad69357

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
language: python
33
python:
4-
- '2.6'
54
- '2.7'
65
- '3.3'
76
- '3.4'
@@ -27,7 +26,6 @@ before_install:
2726
install:
2827
- pip install -r requirements.txt
2928
- pip install requests_mock pylint coveralls
30-
- "if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2 ipaddr; fi"
3129
- "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install ipaddr; fi"
3230
script:
3331
- coverage run --source=geoip2 setup.py test

HISTORY.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ History
66
2.8.0
77
+++++++++++++++++
88

9+
* Python 2.6 support has been dropped. Python 2.7+ or 3.3+ is now required.
910
* Renamed user ID to account ID in the code and added support for the new
1011
``ACCOUNT_ID_REQUIRED`` AND ``ACCOUNT_ID_UNKNOWN`` error codes.
1112

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ correction, please `contact MaxMind support
385385
Requirements
386386
------------
387387

388-
This code requires Python 2.6+ or 3.3+. Older versions are not supported.
388+
This code requires Python 2.7+ or 3.3+. Older versions are not supported.
389389
This library has been tested with CPython and PyPy.
390390

391391
The Requests HTTP library is also required. See

setup.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@
2424
package_data={'': ['LICENSE']},
2525
package_dir={'geoip2': 'geoip2'},
2626
include_package_data=True,
27+
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*',
2728
install_requires=requirements,
28-
extras_require={
29-
':python_version=="2.6" or python_version=="2.7"': ['ipaddress']
30-
},
29+
extras_require={':python_version=="2.7"': ['ipaddress']},
3130
tests_require=['requests_mock>=0.5'],
3231
test_suite="tests",
3332
license=geoip2.__license__,
@@ -37,7 +36,6 @@
3736
'Intended Audience :: Developers',
3837
'Intended Audience :: System Administrators',
3938
'License :: OSI Approved :: Apache Software License',
40-
'Programming Language :: Python :: 2.6',
4139
'Programming Language :: Python :: 2.7',
4240
'Programming Language :: Python :: 3',
4341
'Programming Language :: Python :: 3.3',

0 commit comments

Comments
 (0)