Merge branch 'v1-8-test' into v1-8-stable

Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/2b811c44
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/2b811c44
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/2b811c44

Branch: refs/heads/v1-8-stable
Commit: 2b811c445ef62236d25f37ac72bab94e79827032
Parents: f4760c3 af2d0b4
Author: Chris Riccomini <criccom...@apache.org>
Authored: Tue May 9 10:29:23 2017 -0700
Committer: Chris Riccomini <criccom...@apache.org>
Committed: Tue May 9 10:29:23 2017 -0700

----------------------------------------------------------------------
 .rat-excludes                                   |   1 +
 LICENSE                                         | 343 +++++++++++++++++++
 NOTICE                                          |  17 +-
 airflow/bin/cli.py                              |  65 +++-
 airflow/contrib/hooks/spark_submit_hook.py      |  32 +-
 .../contrib/operators/spark_submit_operator.py  |  13 +-
 airflow/hooks/mssql_hook.py                     |  10 +-
 airflow/hooks/mysql_hook.py                     |  15 +-
 airflow/hooks/postgres_hook.py                  |   4 +-
 airflow/jobs.py                                 |  58 +++-
 airflow/models.py                               | 235 +++++++++----
 airflow/operators/latest_only_operator.py       |  30 +-
 airflow/operators/mssql_operator.py             |  11 +-
 airflow/operators/mysql_operator.py             |   8 +-
 airflow/operators/postgres_operator.py          |   7 +-
 airflow/operators/python_operator.py            |  85 +++--
 airflow/operators/sensors.py                    |  24 +-
 airflow/ti_deps/deps/base_ti_dep.py             |  14 +-
 airflow/ti_deps/deps/prev_dagrun_dep.py         |   5 +
 airflow/ti_deps/deps/trigger_rule_dep.py        |   6 +-
 airflow/utils/file.py                           |  20 +-
 airflow/version.py                              |   2 +-
 airflow/www/api/experimental/endpoints.py       |  23 +-
 airflow/www/static/bootstrap-theme.css          |   2 +-
 airflow/www/templates/airflow/dag.html          |   2 +-
 airflow/www/templates/airflow/dags.html         |  31 +-
 airflow/www/templates/airflow/list_dags.html    |   2 +-
 airflow/www/views.py                            |  11 +-
 dags/test_dag.py                                |   3 +-
 scripts/ci/requirements.txt                     |  14 +
 scripts/systemd/airflow                         |  13 +
 setup.py                                        |  13 +-
 tests/contrib/hooks/spark_submit_hook.py        |  51 ++-
 .../contrib/operators/spark_submit_operator.py  |   8 +-
 tests/core.py                                   | 120 ++++++-
 tests/dags/test_dagrun_short_circuit_false.py   |  38 --
 tests/dags/test_latest_runs.py                  |  27 ++
 tests/jobs.py                                   | 201 +++++++++++
 tests/models.py                                 | 306 ++++++++++++++---
 tests/operators/__init__.py                     |   2 +
 tests/operators/latest_only_operator.py         |  12 +-
 tests/operators/operators.py                    |  43 +++
 tests/operators/python_operator.py              | 244 +++++++++++++
 .../ti_deps/deps/dag_ti_slots_available_dep.py  |  41 ---
 tests/ti_deps/deps/dag_unpaused_dep.py          |  41 ---
 tests/ti_deps/deps/dagrun_exists_dep.py         |  41 ---
 tests/ti_deps/deps/not_in_retry_period_dep.py   |  61 ----
 tests/ti_deps/deps/not_running_dep.py           |  39 ---
 tests/ti_deps/deps/not_skipped_dep.py           |  38 --
 tests/ti_deps/deps/pool_has_space_dep.py        |  37 --
 tests/ti_deps/deps/prev_dagrun_dep.py           | 143 --------
 tests/ti_deps/deps/runnable_exec_date_dep.py    |  92 -----
 .../deps/test_dag_ti_slots_available_dep.py     |  42 +++
 tests/ti_deps/deps/test_dag_unpaused_dep.py     |  42 +++
 tests/ti_deps/deps/test_dagrun_exists_dep.py    |  40 +++
 .../deps/test_not_in_retry_period_dep.py        |  59 ++++
 tests/ti_deps/deps/test_not_running_dep.py      |  37 ++
 tests/ti_deps/deps/test_not_skipped_dep.py      |  36 ++
 tests/ti_deps/deps/test_prev_dagrun_dep.py      | 123 +++++++
 .../ti_deps/deps/test_runnable_exec_date_dep.py |  76 ++++
 tests/ti_deps/deps/test_trigger_rule_dep.py     | 252 ++++++++++++++
 tests/ti_deps/deps/test_valid_state_dep.py      |  46 +++
 tests/ti_deps/deps/trigger_rule_dep.py          | 295 ----------------
 tests/ti_deps/deps/valid_state_dep.py           |  49 ---
 64 files changed, 2606 insertions(+), 1195 deletions(-)
----------------------------------------------------------------------


Reply via email to