From 21cbe794695bdee41527a02c01c59faa164dd467 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Grzegorz=20Konefa=C5=82?= <grzegorz.konefal@reef.pl>
Date: Sun, 3 Dec 2017 11:16:03 +0100
Subject: [PATCH] Comments applied

---
 doc/source/whatsnew/v0.22.0.txt |  4 ++--
 setup.py                        | 26 +++++++++-----------------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/doc/source/whatsnew/v0.22.0.txt b/doc/source/whatsnew/v0.22.0.txt
index fd161e91ab37c..c88074258cd00 100644
--- a/doc/source/whatsnew/v0.22.0.txt
+++ b/doc/source/whatsnew/v0.22.0.txt
@@ -245,5 +245,5 @@ Other
 - Fixed a bug where creating a Series from an array that contains both tz-naive and tz-aware values will result in a Series whose dtype is tz-aware instead of object (:issue:`16406`)
 - Fixed construction of a :class:`Series` from a ``dict`` containing ``NaN`` as key (:issue:`18480`)
 - Adding a ``Period`` object to a ``datetime`` or ``Timestamp`` object will now correctly raise a ``TypeError`` (:issue:`17983`)
-- BLD: since we already use setuptools, let's remove the optional logic in setup.py (:issue:`18113`)
-- 
+- Simplified setup due to explicit dependence on setuptools (:issue:`18113`)
+-
diff --git a/setup.py b/setup.py
index 22c2ef4c7509b..da39fceaaa1b7 100755
--- a/setup.py
+++ b/setup.py
@@ -41,23 +41,17 @@ def is_platform_mac():
     _CYTHON_INSTALLED = False
 
 
-setuptools_kwargs = {}
 min_numpy_ver = '1.9.0'
-if sys.version_info[0] >= 3:
+setuptools_kwargs = {
+    'install_requires': [
+        'python-dateutil >= 2' if sys.version_info[0] >= 3 else 'python-dateutil',
+        'pytz >= 2011k',
+        'numpy >= %s' % min_numpy_ver,
+    ],
+    'setup_requires': ['numpy >= %s' % min_numpy_ver],
+    'zip_safe': False,
+}
 
-    setuptools_kwargs = {'zip_safe': False,
-                         'install_requires': ['python-dateutil >= 2',
-                                              'pytz >= 2011k',
-                                              'numpy >= %s' % min_numpy_ver],
-                         'setup_requires': ['numpy >= %s' % min_numpy_ver]}
-else:
-    setuptools_kwargs = {
-        'install_requires': ['python-dateutil',
-                             'pytz >= 2011k',
-                             'numpy >= %s' % min_numpy_ver],
-        'setup_requires': ['numpy >= %s' % min_numpy_ver],
-        'zip_safe': False,
-    }
 
 from distutils.extension import Extension  # noqa:E402
 from distutils.command.build import build  # noqa:E402
@@ -709,8 +703,6 @@ def pxd(name):
                       sources=['pandas/util/move.c'])
 extensions.append(_move_ext)
 
-setuptools_kwargs["test_suite"] = "nose.collector"
-
 # The build cache system does string matching below this point.
 # if you change something, be careful.