[arrow] branch master updated: ARROW-3119: [Packaging] Nightly packaging script fails

[uw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

uwe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 56b50f6  ARROW-3119: [Packaging] Nightly packaging script fails
56b50f6 is described below

commit 56b50f63d1d7575843b38d379bed0ba4d5303656
Author: Krisztián Szűcs <sz...@gmail.com>
AuthorDate: Wed Aug 29 15:36:54 2018 +0200

    ARROW-3119: [Packaging] Nightly packaging script fails
    
    Author: Krisztián Szűcs <sz...@gmail.com>
    
    Closes #2476 from kszucs/ARROW-3119 and squashes the following commits:
    
    c124c3f0 <Krisztián Szűcs> cast ruamel yaml's CommentedSeq to list before concatenation
---
 dev/tasks/crossbow.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/dev/tasks/crossbow.py b/dev/tasks/crossbow.py
index 5e4c42c..fae5c0a 100755
--- a/dev/tasks/crossbow.py
+++ b/dev/tasks/crossbow.py
@@ -418,17 +418,20 @@ def load_tasks_from_config(config_path, task_names, group_names):
     with Path(config_path).open() as fp:
         config = yaml.load(fp)
 
-    valid_groups = set(config['groups'].keys())
+    groups = config['groups']
+    tasks = config['tasks']
+
+    valid_groups = set(groups.keys())
+    valid_tasks = set(tasks.keys())
+
     requested_groups = set(group_names)
     invalid_groups = requested_groups - valid_groups
     if invalid_groups:
         raise click.ClickException('Invalid group(s) {!r}. Must be one of {!r}'
                                    .format(invalid_groups, valid_groups))
 
-    valid_tasks = set(config['tasks'].keys())
-    requested_tasks = set(
-        sum([config['groups'][g] for g in group_names], list(task_names))
-    )
+    requested_tasks = [list(groups[name]) for name in group_names]
+    requested_tasks = set(sum(requested_tasks, list(task_names)))
     invalid_tasks = requested_tasks - valid_tasks
     if invalid_tasks:
         raise click.ClickException('Invalid task(s) {!r}. Must be one of {!r}'