From: Eric Biagiotti <ebiagiotti@veritasgenetics.com>
Date: Thu, 28 Feb 2019 20:18:55 +0000 (-0500)
Subject: 14885: Adds python2 conditional pytz import
X-Git-Tag: 1.4.0~125^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/d9e5d620d8e68b349bb79b9749a74110603a89d4

14885: Adds python2 conditional pytz import

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>
---

diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 20a601802d..d97e7428da 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -43,6 +43,7 @@ setup(name='arvados-cwl-runner',
       ],
       extras_require={
           ':os.name=="posix" and python_version<"3"': ['subprocess32 >= 3.5.1'],
+          ':python_version<"3"': ['pytz'],
       },
       data_files=[
           ('share/doc/arvados-cwl-runner', ['LICENSE-2.0.txt', 'README.rst']),
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index f4b4012a0b..ffca23495c 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -57,6 +57,7 @@ setup(name='arvados-python-client',
       ],
       extras_require={
           ':os.name=="posix" and python_version<"3"': ['subprocess32 >= 3.5.1'],
+          ':python_version<"3"': ['pytz'],
       },
       classifiers=[
           'Programming Language :: Python :: 2',
diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index f2e385fa73..9b4b997cdc 100644
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -45,6 +45,9 @@ setup(name='arvados_fuse',
         'ciso8601 >= 2.0.0',
         'setuptools'
         ],
+      extras_require={
+          ':python_version<"3"': ['pytz'],
+      },
       test_suite='tests',
       tests_require=['pbr<1.7.0', 'mock>=1.0', 'PyYAML'],
       zip_safe=False