Unverified Commit 30843df1 authored by Serge S. Koval's avatar Serge S. Koval Committed by GitHub

Merge pull request #1592 from jbochi/bye_26

Drop support for python 2.6
parents 2c2c98e0 c595d75c
...@@ -2,10 +2,6 @@ sudo: false ...@@ -2,10 +2,6 @@ sudo: false
language: python language: python
matrix: matrix:
include: include:
- python: 2.6
env: TOX_ENV=py26-WTForms1
- python: 2.6
env: TOX_ENV=py26-WTForms2
- python: 2.7 - python: 2.7
env: TOX_ENV=py27-WTForms1 env: TOX_ENV=py27-WTForms1
- python: 2.7 - python: 2.7
......
...@@ -41,7 +41,7 @@ Support ...@@ -41,7 +41,7 @@ Support
**** ****
Python 2.6 - 2.7 and 3.3 - 3.4. Python 2.7 and 3.3 or higher.
Indices And Tables Indices And Tables
------------------ ------------------
......
...@@ -36,9 +36,6 @@ install_requires = [ ...@@ -36,9 +36,6 @@ install_requires = [
'wtforms' 'wtforms'
] ]
if sys.version_info[:2] < (2, 7):
install_requires.append('ordereddict')
setup( setup(
name='Flask-Admin', name='Flask-Admin',
version=grep('__version__'), version=grep('__version__'),
...@@ -76,10 +73,10 @@ setup( ...@@ -76,10 +73,10 @@ setup(
'Programming Language :: Python', 'Programming Language :: Python',
'Topic :: Software Development :: Libraries :: Python Modules', 'Topic :: Software Development :: Libraries :: Python Modules',
'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
], ],
test_suite='nose.collector' test_suite='nose.collector'
) )
[tox] [tox]
envlist = envlist =
py{26,27,33,34,35,36}-WTForms{1,2} py{27,33,34,35,36}-WTForms{1,2}
flake8 flake8
docs-html docs-html
skipsdist = true skipsdist = true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment