From 63940e54a8a9f8abfc61b66d3eada250cd993165 Mon Sep 17 00:00:00 2001 From: Matt Roeschke Date: Sun, 7 Jul 2019 22:58:10 -0700 Subject: [PATCH 1/3] Create test/window directory and conftest file --- __init__.py | 0 pandas/tests/window/__init__.py | 0 pandas/tests/window/conftest.py | 49 ++++++++++++++++++++++++ pandas/tests/{ => window}/test_window.py | 33 ---------------- 4 files changed, 49 insertions(+), 33 deletions(-) create mode 100644 __init__.py create mode 100644 pandas/tests/window/__init__.py create mode 100644 pandas/tests/window/conftest.py rename pandas/tests/{ => window}/test_window.py (99%) diff --git a/__init__.py b/__init__.py new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/pandas/tests/window/__init__.py b/pandas/tests/window/__init__.py new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/pandas/tests/window/conftest.py b/pandas/tests/window/conftest.py new file mode 100644 index 0000000000000..c3df62f31ca4f --- /dev/null +++ b/pandas/tests/window/conftest.py @@ -0,0 +1,49 @@ +import pytest + + +@pytest.fixture(params=[True, False]) +def raw(request): + return request.param + + +@pytest.fixture( + params=[ + "triang", + "blackman", + "hamming", + "bartlett", + "bohman", + "blackmanharris", + "nuttall", + "barthann", + ] +) +def win_types(request): + return request.param + + +@pytest.fixture(params=["kaiser", "gaussian", "general_gaussian", "exponential"]) +def win_types_special(request): + return request.param + + +@pytest.fixture( + params=["sum", "mean", "median", "max", "min", "var", "std", "kurt", "skew"] +) +def arithmetic_win_operators(request): + return request.param + + +@pytest.fixture(params=['right', 'left', 'both', 'neither']) +def closed(request): + return request.param + + +@pytest.fixture(params=[True, False]) +def center(request): + return request.param + + +@pytest.fixture(params=[None, 1]) +def min_periods(request): + return request.param diff --git a/pandas/tests/test_window.py b/pandas/tests/window/test_window.py similarity index 99% rename from pandas/tests/test_window.py rename to pandas/tests/window/test_window.py index 2df5460a05953..7efd5ae5e6058 100644 --- a/pandas/tests/test_window.py +++ b/pandas/tests/window/test_window.py @@ -30,39 +30,6 @@ def assert_equal(left, right): tm.assert_frame_equal(left, right) -@pytest.fixture(params=[True, False]) -def raw(request): - return request.param - - -@pytest.fixture( - params=[ - "triang", - "blackman", - "hamming", - "bartlett", - "bohman", - "blackmanharris", - "nuttall", - "barthann", - ] -) -def win_types(request): - return request.param - - -@pytest.fixture(params=["kaiser", "gaussian", "general_gaussian", "exponential"]) -def win_types_special(request): - return request.param - - -@pytest.fixture( - params=["sum", "mean", "median", "max", "min", "var", "std", "kurt", "skew"] -) -def arithmetic_win_operators(request): - return request.param - - class Base: _nan_locs = np.arange(20, 40) From b16da3f1c79a75766b6e4c2fbc9001a767a3f379 Mon Sep 17 00:00:00 2001 From: Matt Roeschke Date: Sun, 7 Jul 2019 23:05:03 -0700 Subject: [PATCH 2/3] Add some typing --- pandas/tests/window/conftest.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pandas/tests/window/conftest.py b/pandas/tests/window/conftest.py index c3df62f31ca4f..4cbf3d91d21ee 100644 --- a/pandas/tests/window/conftest.py +++ b/pandas/tests/window/conftest.py @@ -1,8 +1,10 @@ +from typing import Any + import pytest @pytest.fixture(params=[True, False]) -def raw(request): +def raw(request) -> bool: return request.param @@ -18,32 +20,32 @@ def raw(request): "barthann", ] ) -def win_types(request): +def win_types(request) -> str: return request.param @pytest.fixture(params=["kaiser", "gaussian", "general_gaussian", "exponential"]) -def win_types_special(request): +def win_types_special(request) -> str: return request.param @pytest.fixture( params=["sum", "mean", "median", "max", "min", "var", "std", "kurt", "skew"] ) -def arithmetic_win_operators(request): +def arithmetic_win_operators(request) -> str: return request.param @pytest.fixture(params=['right', 'left', 'both', 'neither']) -def closed(request): +def closed(request) -> str: return request.param @pytest.fixture(params=[True, False]) -def center(request): +def center(request) -> bool: return request.param @pytest.fixture(params=[None, 1]) -def min_periods(request): +def min_periods(request) -> Any: return request.param From 474da04ea05e44298db674488608e0fb0326580b Mon Sep 17 00:00:00 2001 From: Matt Roeschke Date: Sun, 7 Jul 2019 23:09:38 -0700 Subject: [PATCH 3/3] Remove accidental __init__.py creation --- __init__.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 __init__.py diff --git a/__init__.py b/__init__.py deleted file mode 100644 index e69de29bb2d1d..0000000000000