Dropped py26 support

This commit is contained in:
Konsta Vesterinen 2016-03-05 11:06:12 +02:00
parent 0950f49790
commit adacee8bdd
5 changed files with 10 additions and 17 deletions

View File

@ -11,9 +11,6 @@ before_script:
matrix:
include:
- python: 2.6
env:
- "TOXENV=py26"
- python: 2.7
env:
- "TOXENV=py27"

View File

@ -4,6 +4,12 @@ Changelog
Here you can see the full list of changes between each SQLAlchemy-Utils release.
0.32.0 (2016-03-xx)
^^^^^^^^^^^^^^^^^^^
- Dropped py26 support
0.31.6 (2016-01-21)
^^^^^^^^^^^^^^^^^^^

View File

@ -75,11 +75,7 @@ setup(
platforms='any',
install_requires=[
'six',
'SQLAlchemy>=1.0',
'total_ordering>=0.1'
if sys.version_info[0] == 2 and sys.version_info[1] < 7 else '',
'ordereddict>=1.1'
if sys.version_info[0] == 2 and sys.version_info[1] < 7 else '',
'SQLAlchemy>=1.0'
],
extras_require=extras_require,
classifiers=[

View File

@ -1,7 +1,4 @@
try:
from collections import OrderedDict
except ImportError:
from ordereddict import OrderedDict
from collections import OrderedDict
from functools import partial
from inspect import isclass

View File

@ -1,9 +1,6 @@
# -*- coding: utf-8 -*-
try:
from functools import total_ordering
except ImportError:
# Python 2.6 port
from total_ordering import total_ordering
from functools import total_ordering
from .. import i18n
from ..utils import str_coercible