[med-svn] [snakemake] 02/04: Merge tag 'upstream/3.10.0'

[Kevin Murray]

This is an automated email from the git hooks/post-receive script.

daube-guest pushed a commit to branch master
in repository snakemake.

commit 94c2c274e7278e45f8c9cbac0fe2f3c26ecbe03e
Merge: 085a5d7 91fdd01
Author: Kevin Murray <kdmfoss at gmail.com>
Date:   Thu Jan 19 11:27:50 2017 +1100

    Merge tag 'upstream/3.10.0'
    
    Upstream version 3.10.0

 CHANGELOG.md                                       |  14 ++-
 docs/index.rst                                     |   2 +-
 docs/project_info/faq.rst                          |   4 +-
 docs/snakefiles/rules.rst                          |  41 +++++++
 docs/tutorial/welcome.rst                          |   2 +-
 snakemake/__init__.py                              |  22 +++-
 snakemake/common.py                                |  24 ++++
 snakemake/conda.py                                 | 121 +++++++++++++++++----
 snakemake/dag.py                                   |  99 ++++++++++++++++-
 snakemake/executors.py                             |  15 ++-
 snakemake/io.py                                    |  32 +++++-
 snakemake/jobs.py                                  |  65 ++++++++---
 snakemake/logging.py                               |  72 ++++++------
 snakemake/persistence.py                           |   4 +-
 snakemake/remote/HTTP.py                           |   3 +
 snakemake/rules.py                                 |  57 +++++++---
 snakemake/script.py                                |  13 ++-
 snakemake/version.py                               |   2 +-
 snakemake/workflow.py                              |  11 +-
 tests/test_parser/Snakefile                        |   3 +-
 tests/test_unpack_dict/Snakefile                   |  27 +++++
 .../expected-results/prefix.out1.txt               |   1 +
 .../expected-results/prefix.out2.txt               |   1 +
 tests/test_unpack_dict/prefix.in1.txt              |   1 +
 tests/test_unpack_dict/prefix.in2.txt              |   1 +
 tests/test_unpack_list/Snakefile                   |  27 +++++
 .../expected-results/prefix.out1.txt               |   1 +
 .../expected-results/prefix.out2.txt               |   1 +
 tests/test_unpack_list/prefix.in1.txt              |   1 +
 tests/test_unpack_list/prefix.in2.txt              |   1 +
 tests/tests.py                                     |   8 ++
 31 files changed, 553 insertions(+), 123 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/snakemake.git