Repository: incubator-airflow Updated Branches: refs/heads/master b87d3a490 -> d2d3e49ca
[AIRFLOW-1201] Update deprecated 'nose-parameterized' The 'parameterized' package should be used now, Closes #2298 from skudriashev/airflow-1201 Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/d2d3e49c Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/d2d3e49c Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/d2d3e49c Branch: refs/heads/master Commit: d2d3e49ca024fd160d37eb99093de85f1192b783 Parents: b87d3a4 Author: Stanislav Kudriashev <[email protected]> Authored: Tue May 16 11:34:52 2017 +0200 Committer: Bolke de Bruin <[email protected]> Committed: Tue May 16 11:34:52 2017 +0200 ---------------------------------------------------------------------- scripts/ci/requirements.txt | 2 +- setup.py | 2 +- tests/models.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/d2d3e49c/scripts/ci/requirements.txt ---------------------------------------------------------------------- diff --git a/scripts/ci/requirements.txt b/scripts/ci/requirements.txt index ad02962..bf2d386 100644 --- a/scripts/ci/requirements.txt +++ b/scripts/ci/requirements.txt @@ -58,11 +58,11 @@ mysqlclient nose nose-exclude nose-ignore-docstring==0.2 -nose-parameterized nose-timer oauth2client>=2.0.2,<2.1.0 pandas pandas-gbq +parameterized psutil>=4.2.0, <5.0.0 psycopg2 pydruid http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/d2d3e49c/setup.py ---------------------------------------------------------------------- diff --git a/setup.py b/setup.py index 0a5708c..71c3f49 100644 --- a/setup.py +++ b/setup.py @@ -193,8 +193,8 @@ devel = [ 'moto', 'nose', 'nose-ignore-docstring==0.2', - 'nose-parameterized', 'nose-timer', + 'parameterized', 'rednose' ] devel_minreq = devel + mysql + doc + password + s3 + cgroups http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/d2d3e49c/tests/models.py ---------------------------------------------------------------------- diff --git a/tests/models.py b/tests/models.py index d367fbb..931a6aa 100644 --- a/tests/models.py +++ b/tests/models.py @@ -35,7 +35,7 @@ from airflow.operators.python_operator import ShortCircuitOperator from airflow.ti_deps.deps.trigger_rule_dep import TriggerRuleDep from airflow.utils.state import State from mock import patch -from nose_parameterized import parameterized +from parameterized import parameterized DEFAULT_DATE = datetime.datetime(2016, 1, 1)
