drop 2.6

kennethreitz · Aug 27, 2017 · 5dd74c0 · 5dd74c0
1 parent a50ff92
commit 5dd74c0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,5 @@
 language: python
 python:
-  - 2.6
   - 2.7
   - 3.3
   - 3.4

diff --git a/setup.py b/setup.py
@@ -47,12 +47,10 @@
     '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 @@
         '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
@@ -18,8 +18,8 @@
 
 
 __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
@@ -5,7 +5,6 @@
 import json
 import unittest
 import sys
-import os
 
 import datetime
-Original file line number
+Diff line change
@@ -1,6 +1,5 @@
     language: python
     python:
-      - 2.6
       - 2.7
       - 3.3
       - 3.4
@@ Expand Down @@