From bc58b66a966c1f3960d0a3857090fa0fd60ad3b6 Mon Sep 17 00:00:00 2001 From: "Christopher J. Wright" Date: Mon, 9 Sep 2019 13:54:58 -0400 Subject: [PATCH 1/9] cover tests --- .coveragerc | 1 - 1 file changed, 1 deletion(-) diff --git a/.coveragerc b/.coveragerc index a7f2a663..cb720eb0 100644 --- a/.coveragerc +++ b/.coveragerc @@ -8,7 +8,6 @@ omit = # ignore _version.py and versioneer.py .*version.* *_version.py - */test_*.py exclude_lines = if __name__ == '__main__': From e0ea01626dcb7bc8a557cd836de3154635aafa7c Mon Sep 17 00:00:00 2001 From: "Christopher J. Wright" Date: Mon, 9 Sep 2019 14:09:09 -0400 Subject: [PATCH 2/9] include cudf for tests --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9dd069c7..20fbbe19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ install: - conda update conda # Install dependencies - - conda create -n test-streamz python=$TRAVIS_PYTHON_VERSION pytest tornado toolz flake8 coverage codecov networkx graphviz python-graphviz dask distributed pandas bokeh ipython ipykernel ipywidgets python-confluent-kafka -c conda-forge -c bokeh + - conda create -n test-streamz python=$TRAVIS_PYTHON_VERSION pytest tornado toolz flake8 coverage codecov networkx graphviz python-graphviz dask distributed pandas bokeh ipython ipykernel ipywidgets python-confluent-kafka cudf -c conda-forge -c bokeh - source activate test-streamz - pip install git+https://github.com/dask/distributed.git --upgrade --no-deps From 8e2df41c2ca40a940941bd1f66da89bd0b85749a Mon Sep 17 00:00:00 2001 From: "Christopher J. Wright" Date: Mon, 9 Sep 2019 14:20:50 -0400 Subject: [PATCH 3/9] remove cudf --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 20fbbe19..9dd069c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ install: - conda update conda # Install dependencies - - conda create -n test-streamz python=$TRAVIS_PYTHON_VERSION pytest tornado toolz flake8 coverage codecov networkx graphviz python-graphviz dask distributed pandas bokeh ipython ipykernel ipywidgets python-confluent-kafka cudf -c conda-forge -c bokeh + - conda create -n test-streamz python=$TRAVIS_PYTHON_VERSION pytest tornado toolz flake8 coverage codecov networkx graphviz python-graphviz dask distributed pandas bokeh ipython ipykernel ipywidgets python-confluent-kafka -c conda-forge -c bokeh - source activate test-streamz - pip install git+https://github.com/dask/distributed.git --upgrade --no-deps From d37a85bb6a5cc095f744c76e0ad3b5f20fb2a2f3 Mon Sep 17 00:00:00 2001 From: "Christopher J. Wright" Date: Mon, 9 Sep 2019 14:37:17 -0400 Subject: [PATCH 4/9] ignore path for projects --- .codecov.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.codecov.yml b/.codecov.yml index f6137fa3..3078e8a6 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -21,7 +21,8 @@ coverage: if_no_uploads: error if_not_found: success if_ci_failed: failure - paths: '!*/tests/.*' + ignore: + - '*/tests/.*' tests: target: 97.9% @@ -30,4 +31,4 @@ coverage: flags: tests: paths: - - tests/ \ No newline at end of file + - tests/ From 0b0cd3d681e7e1ac6a0ecb36bb479506f9bae105 Mon Sep 17 00:00:00 2001 From: "Christopher J. Wright" Date: Mon, 9 Sep 2019 15:26:26 -0400 Subject: [PATCH 5/9] only ignore for project --- .codecov.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.codecov.yml b/.codecov.yml index 3078e8a6..a8c8b644 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -21,8 +21,8 @@ coverage: if_no_uploads: error if_not_found: success if_ci_failed: failure - ignore: - - '*/tests/.*' + ignore: + - '*/tests/.*' tests: target: 97.9% From 594408795ee098bce8513f8c3c5b492291115919 Mon Sep 17 00:00:00 2001 From: "Christopher J. Wright" Date: Tue, 10 Sep 2019 10:52:41 -0400 Subject: [PATCH 6/9] try ignore paths --- .codecov.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.codecov.yml b/.codecov.yml index a8c8b644..ac131264 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -21,8 +21,7 @@ coverage: if_no_uploads: error if_not_found: success if_ci_failed: failure - ignore: - - '*/tests/.*' + paths: '!streamz/.*/tests/.*' tests: target: 97.9% From 59693a9759a22e84c871be33c1915f041501db77 Mon Sep 17 00:00:00 2001 From: "Christopher J. Wright" Date: Tue, 10 Sep 2019 10:58:14 -0400 Subject: [PATCH 7/9] no cover --- .coveragerc | 1 + streamz/dataframe/tests/test_cudf.py | 1 + 2 files changed, 2 insertions(+) diff --git a/.coveragerc b/.coveragerc index cb720eb0..3c024f1c 100644 --- a/.coveragerc +++ b/.coveragerc @@ -11,3 +11,4 @@ omit = exclude_lines = if __name__ == '__main__': + pragma: no cover diff --git a/streamz/dataframe/tests/test_cudf.py b/streamz/dataframe/tests/test_cudf.py index 1cb89943..2ce2cd99 100644 --- a/streamz/dataframe/tests/test_cudf.py +++ b/streamz/dataframe/tests/test_cudf.py @@ -17,6 +17,7 @@ from streamz.dask import DaskStream from streamz.dataframe import DataFrame, Series, DataFrames, Aggregation +# pragma: no cover cudf = pytest.importorskip("cudf") From dc0d9c52b848db83f68ae0639121ac17a33b675e Mon Sep 17 00:00:00 2001 From: "Christopher J. Wright" Date: Tue, 10 Sep 2019 11:01:36 -0400 Subject: [PATCH 8/9] no cover --- streamz/dataframe/tests/test_cudf_dataframes.py | 1 + 1 file changed, 1 insertion(+) diff --git a/streamz/dataframe/tests/test_cudf_dataframes.py b/streamz/dataframe/tests/test_cudf_dataframes.py index a557a848..59bc986e 100644 --- a/streamz/dataframe/tests/test_cudf_dataframes.py +++ b/streamz/dataframe/tests/test_cudf_dataframes.py @@ -20,6 +20,7 @@ from streamz.dask import DaskStream from streamz.dataframe import Aggregation, DataFrame, DataFrames, Series +# pragma: no cover cudf = pytest.importorskip("cudf") From 529f55ddff8f52a507ef21df37a691142455798d Mon Sep 17 00:00:00 2001 From: "Christopher J. Wright" Date: Wed, 11 Sep 2019 18:51:44 -0400 Subject: [PATCH 9/9] no cover --- streamz/dataframe/tests/test_dataframe_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/streamz/dataframe/tests/test_dataframe_utils.py b/streamz/dataframe/tests/test_dataframe_utils.py index 617a5734..35849858 100644 --- a/streamz/dataframe/tests/test_dataframe_utils.py +++ b/streamz/dataframe/tests/test_dataframe_utils.py @@ -31,7 +31,7 @@ def test_utils_get_base_frame_type_pandas(): assert issubclass(get_base_frame_type("Index", is_index_like, df.index), pd.Index) -def test_utils_get_base_frame_type_cudf(): +def test_utils_get_base_frame_type_cudf(): # pragma: no cover cudf = pytest.importorskip("cudf") df = cudf.DataFrame({'x': np.arange(10, dtype=float), 'y': [1.0, 2.0] * 5}) @@ -62,7 +62,7 @@ def test_get_dataframe_package_pandas(): assert pd == get_dataframe_package(df.index) -def test_get_dataframe_package_cudf(): +def test_get_dataframe_package_cudf(): # pragma: no cover cudf = pytest.importorskip("cudf") df = cudf.DataFrame({'x': np.arange(10, dtype=float), 'y': [1.0, 2.0] * 5}) assert cudf == get_dataframe_package(df)