From adacee8bdd6bfd3b6397c7c7e373f71095a9d605 Mon Sep 17 00:00:00 2001 From: Konsta Vesterinen Date: Sat, 5 Mar 2016 11:06:12 +0200 Subject: [PATCH] Dropped py26 support --- .travis.yml | 3 --- CHANGES.rst | 6 ++++++ setup.py | 6 +----- sqlalchemy_utils/functions/orm.py | 5 +---- sqlalchemy_utils/primitives/weekday.py | 7 ++----- 5 files changed, 10 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 96b6205..80117d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,9 +11,6 @@ before_script: matrix: include: - - python: 2.6 - env: - - "TOXENV=py26" - python: 2.7 env: - "TOXENV=py27" diff --git a/CHANGES.rst b/CHANGES.rst index 728378e..4ed8808 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -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) ^^^^^^^^^^^^^^^^^^^ diff --git a/setup.py b/setup.py index 83b9f81..171d271 100644 --- a/setup.py +++ b/setup.py @@ -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=[ diff --git a/sqlalchemy_utils/functions/orm.py b/sqlalchemy_utils/functions/orm.py index bf09a46..1e37d66 100644 --- a/sqlalchemy_utils/functions/orm.py +++ b/sqlalchemy_utils/functions/orm.py @@ -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 diff --git a/sqlalchemy_utils/primitives/weekday.py b/sqlalchemy_utils/primitives/weekday.py index 501a55f..ce1b63b 100644 --- a/sqlalchemy_utils/primitives/weekday.py +++ b/sqlalchemy_utils/primitives/weekday.py @@ -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