15028: Update cwltool/schema-salad deps, fix tests

[arvados.git] / sdk / cwl / setup.py

diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 3b4dfbe99111972e638ae19ac40813d065f6d2d4..3ccf49f9e8f083768334fdbf22f302614efd9355 100644 (file)
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -33,18 +33,26 @@ setup(name='arvados-cwl-runner',
       # Note that arvados/build/run-build-packages.sh looks at this
       # file to determine what version of cwltool and schema-salad to build.
       install_requires=[
-          'cwltool==1.0.20180806194258',
-          'schema-salad==2.7.20180719125426',
+          'cwltool==1.0.20190422193858',
+          'schema-salad==4.1.20190305210046',
           'typing >= 3.6.4',
-          'ruamel.yaml >=0.13.11, <0.15',
-          'arvados-python-client>=1.1.4.20180607143841',
+          'ruamel.yaml >=0.15.54, <=0.15.77',
+          'arvados-python-client>=1.3.0.20190205182514',
           'setuptools',
-          'ciso8601 >=1.0.6, <2.0.0',
-          'subprocess32>=3.5.1',
+          'ciso8601 >= 2.0.0',
+          'networkx < 2.3'
       ],
+      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']),
       ],
+      classifiers=[
+          'Programming Language :: Python :: 2',
+          'Programming Language :: Python :: 3',
+      ],
       test_suite='tests',
       tests_require=[
           'mock>=1.0',