DEPS: Drop Python 3.4 support

Closes pandas-devgh-15251.
forking-repos · May 11, 2017 · 5bc84dc · 5bc84dc
1 parent 1bee035
commit 5bc84dc
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 65 deletions.
diff --git a/ci/requirements-3.4.build b/ci/requirements-3.4.build
diff --git a/ci/requirements-3.4.pip b/ci/requirements-3.4.pip
diff --git a/ci/requirements-3.4.run b/ci/requirements-3.4.run
diff --git a/ci/requirements-3.4_SLOW.run b/ci/requirements-3.4_SLOW.run
diff --git a/ci/requirements-3.4_SLOW.sh b/ci/requirements-3.4_SLOW.sh
diff --git a/ci/requirements-3.6.run b/ci/requirements-3.6.run
@@ -14,7 +14,7 @@ html5lib
 jinja2
 sqlalchemy
 pymysql
-feather-format
+# feather-format (not available on defaults ATM)
 # psycopg2 (not avail on defaults ATM)
 beautifulsoup4
 s3fs

diff --git a/ci/requirements-3.4_SLOW.build → ci/requirements-3.6_SLOW.build b/ci/requirements-3.4_SLOW.build → ci/requirements-3.6_SLOW.build
@@ -1,6 +1,6 @@
-python=3.4*
+python=3.6*
 python-dateutil
 pytz
 nomkl
-numpy=1.10*
+numpy
 cython
diff --git a/ci/requirements-3.6_SLOW.pip b/ci/requirements-3.6_SLOW.pip
diff --git a/ci/requirements-3.6_SLOW.run b/ci/requirements-3.6_SLOW.run
@@ -0,0 +1,22 @@
+python-dateutil
+pytz
+numpy
+scipy
+openpyxl
+xlsxwriter
+xlrd
+xlwt
+numexpr
+pytables
+matplotlib
+lxml
+html5lib
+jinja2
+sqlalchemy
+pymysql
+# feather-format (not available on defaults ATM)
+# psycopg2 (not available on defaults ATM)
+beautifulsoup4
+s3fs
+xarray
+ipython
diff --git a/circle.yml b/circle.yml
@@ -23,9 +23,9 @@ dependencies:
        0)
          sudo apt-get install language-pack-it && ./ci/install_circle.sh JOB="2.7_COMPAT" LOCALE_OVERRIDE="it_IT.UTF-8" ;;
        1)
-         sudo apt-get install language-pack-zh-hans && ./ci/install_circle.sh JOB="3.4_SLOW" LOCALE_OVERRIDE="zh_CN.UTF-8" ;;
+         sudo apt-get install language-pack-zh-hans && ./ci/install_circle.sh JOB="3.6_SLOW" LOCALE_OVERRIDE="zh_CN.UTF-8" ;;
        2)
-         sudo apt-get install language-pack-zh-hans && ./ci/install_circle.sh JOB="3.4" LOCALE_OVERRIDE="zh_CN.UTF-8" ;;
+         sudo apt-get install language-pack-zh-hans && ./ci/install_circle.sh JOB="3.6" LOCALE_OVERRIDE="zh_CN.UTF-8" ;;
        3)
          ./ci/install_circle.sh JOB="3.5_ASCII" LOCALE_OVERRIDE="C" ;;
       esac

diff --git a/doc/source/whatsnew/v0.21.0.txt b/doc/source/whatsnew/v0.21.0.txt
@@ -34,7 +34,7 @@ Other Enhancements
 Backwards incompatible API changes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-
+- Support has been dropped for Python 3.4 (:issue:`15251`)
 
 .. _whatsnew_0210.api:
 

diff --git a/pandas/compat/__init__.py b/pandas/compat/__init__.py
@@ -7,7 +7,7 @@
 Key items to import for 2/3 compatible code:
 * iterators: range(), map(), zip(), filter(), reduce()
 * lists: lrange(), lmap(), lzip(), lfilter()
-* unicode: u() [u"" is a syntax error in Python 3.0-3.2]
+* unicode: u() [no unicode builtin in Python 3]
 * longs: long (int in Python 3)
 * callable
 * iterable method compatibility: iteritems, iterkeys, itervalues
@@ -110,7 +110,7 @@ def signature(f):
     unichr = chr
 
     # This was introduced in Python 3.3, but we don't support
-    # Python 3.x < 3.4, so checking PY3 is safe.
+    # Python 3.x < 3.5, so checking PY3 is safe.
     FileNotFoundError = FileNotFoundError
 
     # list-producing versions of the major Python iterating functions

diff --git a/setup.py b/setup.py
@@ -246,7 +246,6 @@ def build_extensions(self):
     'Programming Language :: Python :: 2',
     'Programming Language :: Python :: 3',
     'Programming Language :: Python :: 2.7',
-    'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: 3.6',
     'Programming Language :: Cython',

diff --git a/tox.ini b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27, py34, py35
+envlist = py27, py35, py36
 
 [testenv]
 deps =
@@ -49,14 +49,14 @@ deps =
     bigquery
     {[testenv]deps}
 
-[testenv:py34]
+[testenv:py35]
 deps =
-    numpy==1.8.0
+    numpy==1.10.0
     {[testenv]deps}
 
-[testenv:py35]
+[testenv:py36]
 deps =
-    numpy==1.10.0
+    numpy
     {[testenv]deps}
 
 [testenv:openpyxl1]