From 02880cd1092451550ea65172431e639dda08f2a7 Mon Sep 17 00:00:00 2001 From: Brad Chapman Date: Wed, 13 Feb 2019 05:26:27 -0500 Subject: [PATCH] Update: arvados-cwl-runner, arvados-python-client; second py3k attempt (#13591) Original noarch approach didn't work properly on py3k due to subprocess32 conditional selector. It doesn't get applied on noarch so will be a dependency and make it incompatible with py3. Trying a new approach to restrict to avoid py37 errors. --- recipes/arvados-cwl-runner/meta.yaml | 8 ++++---- recipes/arvados-python-client/meta.yaml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/recipes/arvados-cwl-runner/meta.yaml b/recipes/arvados-cwl-runner/meta.yaml index 506223412427e..3bb14fc588e82 100644 --- a/recipes/arvados-cwl-runner/meta.yaml +++ b/recipes/arvados-cwl-runner/meta.yaml @@ -8,8 +8,8 @@ source: sha256: f0ac46a4d43a6fe62950a64a4c23b92392dd6a1a4b68c27dffdb2f20b602caf3 build: - noarch: python - number: 0 + skip: true # [osx or py37] + number: 1 requirements: host: @@ -19,14 +19,14 @@ requirements: - ruamel.yaml >=0.15.54 - cwltool >=1.0.20181217162649 - schema-salad >=3.0.20181129082112 - - arvados-python-client >=1.2.1.20181130020805 + - arvados-python-client >=1.2.1.20181130020805 # [not py37] run: - python <3.7 - ruamel.yaml >=0.15.54 - cwltool >=1.0.20181217162649 - schema-salad >=3.0.20181129082112 - - arvados-python-client >=1.2.1.20181130020805 + - arvados-python-client >=1.2.1.20181130020805 # [not py37] test: imports: diff --git a/recipes/arvados-python-client/meta.yaml b/recipes/arvados-python-client/meta.yaml index 65f19012076af..e8efa6a15ab7e 100644 --- a/recipes/arvados-python-client/meta.yaml +++ b/recipes/arvados-python-client/meta.yaml @@ -9,15 +9,15 @@ source: sha256: 0b81ee65973087e99a2aa8ac07aeea50877987faac6bdb254cc110bff9d74cff build: - number: 0 - noarch: python + skip: true # [osx or py37] + number: 1 requirements: host: # Supported ciso8601 versions do not have python 3.7 builds - python <3.7 - setuptools - - ciso8601 >=1.0.6,<2.0.0 + - ciso8601 >=1.0.6,<2.0.0 # [not py37] - future - google-api-python-client <1.7,>=1.6.2 - httplib2 @@ -29,7 +29,7 @@ requirements: run: - python <3.7 - setuptools - - ciso8601 >=1.0.6,<2.0.0 + - ciso8601 >=1.0.6,<2.0.0 # [not py37] - future - google-api-python-client <1.7,>=1.6.2 - httplib2