diff --git a/.travis.yml b/.travis.yml index a529744f..5b41a3da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,6 @@ before_script: language: python python: - - 2.6 - 2.7 - 3.3 - 3.4 diff --git a/CHANGES.rst b/CHANGES.rst index e66b9235..be122131 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,13 +4,19 @@ Changelog Here you can see the full list of changes between each SQLAlchemy-Continuum release. -1.2.4 (2015-01-10) +1.3.0 (2016-03-xx) +^^^^^^^^^^^^^^^^^^ + +- Dropped py2.6 support + + +1.2.4 (2016-01-10) ^^^^^^^^^^^^^^^^^^ - Added explicit sequence names for Oracle (#118, courtesy of apfeiffer1) -1.2.3 (2015-01-10) +1.2.3 (2016-01-10) ^^^^^^^^^^^^^^^^^^ - Added use_module_name configuration option (#119, courtesy of kyheo) diff --git a/setup.py b/setup.py index 2d29f0ac..39b419f5 100644 --- a/setup.py +++ b/setup.py @@ -65,9 +65,7 @@ def get_version(): platforms='any', install_requires=[ 'SQLAlchemy>=1.0.8', - 'SQLAlchemy-Utils>=0.30.12', - 'ordereddict>=1.1' - if sys.version_info[0] == 2 and sys.version_info[1] < 7 else '' + 'SQLAlchemy-Utils>=0.30.12' ], extras_require=extras_require, classifiers=[ @@ -77,7 +75,6 @@ def get_version(): 'Operating System :: OS Independent', 'Programming Language :: Python', 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.3', diff --git a/tox.ini b/tox.ini index fb8de168..92d5d72d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py26, py27, py33, py34 +envlist = py27, py33, py34 [testenv] commands = pip install -e ".[test]"