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 20a601802d586eb4d5c9fd2d5dc3853aaa69c233..d97e7428da0488e04009d4a0baeca01bbb18aa8b 100644 (file)
--- 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 f4b4012a0b177cddddf1f0972b2e253627b4303f..ffca23495c475828184b31e355cfdaa42b6e0bdc 100644 (file)
--- 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 f2e385fa73cdd2cea27ac6bbea6f28494928b3ca..9b4b997cdc68dd14353e4621a77da7f30f7146a1 100644 (file)
--- 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