diff options
| author | Kenneth Reitz <me@kennethreitz.org> | 2017-08-27 03:29:44 -0400 |
|---|---|---|
| committer | Kenneth Reitz <me@kennethreitz.org> | 2017-08-27 03:29:44 -0400 |
| commit | 5dd74c0104789b2019c97f863e597369ccfed108 (patch) | |
| tree | 57de45e2ae90211d9cc505f9362e3a5ea259d0b0 | |
| parent | a50ff92ff2aaeae5958728cc4363f0ced23ad772 (diff) | |
| download | tablib-5dd74c0104789b2019c97f863e597369ccfed108.tar.gz | |
drop 2.6
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rwxr-xr-x | setup.py | 7 | ||||
| -rw-r--r-- | tablib/core.py | 4 | ||||
| -rwxr-xr-x | test_tablib.py | 1 |
4 files changed, 4 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 4e09b14..d78dfd6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: python python: - - 2.6 - 2.7 - 3.3 - 3.4 @@ -47,12 +47,10 @@ install = [ 'unicodecsv', 'xlrd', 'xlwt', - 'pyyaml' + 'pyyaml', + 'pandas' ] -# only require Pandas if Python isn't 2.6. -if not (sys.version_info[0] == 2 and sys.version_info[1] == 6): - install.append('pandas') with open('tablib/core.py', 'r') as fd: version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]', @@ -75,7 +73,6 @@ setup( 'Natural Language :: English', 'License :: OSI Approved :: MIT License', 'Programming Language :: Python', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', diff --git a/tablib/core.py b/tablib/core.py index 13a4514..dc45a6f 100644 --- a/tablib/core.py +++ b/tablib/core.py @@ -18,8 +18,8 @@ from tablib.compat import OrderedDict, unicode __title__ = 'tablib' -__version__ = '0.11.5' -__build__ = 0x001104 +__version__ = '0.12.0' +__build__ = 0x001200 __author__ = 'Kenneth Reitz' __license__ = 'MIT' __copyright__ = 'Copyright 2017 Kenneth Reitz' diff --git a/test_tablib.py b/test_tablib.py index 9bd5f12..9b47773 100755 --- a/test_tablib.py +++ b/test_tablib.py @@ -5,7 +5,6 @@ import json import unittest import sys -import os import datetime |