From 17ef8dca76da58fea367cc0c9f5b8b43c0c6a6a5 Mon Sep 17 00:00:00 2001 From: GatlenCulp Date: Mon, 30 Dec 2024 17:28:36 -0500 Subject: [PATCH 1/7] Added additional local .gitignores and pytest.ini options --- .gitignore | 9 ++++++++- pyproject.toml | 4 ++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2f91f4ed0..94e7013f2 100644 --- a/.gitignore +++ b/.gitignore @@ -8,9 +8,16 @@ manual_test/ # other local dev info .vscode/ +.history/ # Mac OS-specific storage files .DS_Store +Icon? +Icon +Icon[\r] + +# ruff +.ruff_cache/ # vim *.swp @@ -174,4 +181,4 @@ cython_debug/ # be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore # and can be added to the global gitignore or merged into this file. For a more nuclear # option (not recommended) you can uncomment the following to ignore the entire idea folder. -#.idea/ +#.idea/ \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 86619ee4e..207a6daab 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,3 +42,7 @@ ccds = "ccds.__main__:main" "Source Code" = "https://github.com/drivendataorg/cookiecutter-data-science/" "Bug Tracker" = "https://github.com/drivendataorg/cookiecutter-data-science/issues" "DrivenData" = "https://drivendata.co" + +[tool.pytest.ini_options] +testpaths = "./tests" +addopts = "-vv --color=yes" \ No newline at end of file From febb57661dc895fa1f5303bd7b29a62e3c1beb15 Mon Sep 17 00:00:00 2001 From: GatlenCulp Date: Mon, 30 Dec 2024 17:33:23 -0500 Subject: [PATCH 2/7] Added test names --- tests/conftest.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 7e9913874..749dd1d41 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -106,9 +106,14 @@ def fast(request): def pytest_generate_tests(metafunc): # setup config fixture to get all of the results from config_generator + def make_test_id(config): + return f"{config['environment_manager']}-{config['dependency_file']}-{config['docs']}" + if "config" in metafunc.fixturenames: metafunc.parametrize( - "config", config_generator(metafunc.config.getoption("fast")) + "config", + config_generator(metafunc.config.getoption("fast")), + ids=make_test_id ) From f1750b2136a44ca373bd92e1b95d3f05c7182e8c Mon Sep 17 00:00:00 2001 From: Chris Kucharczyk Date: Sun, 16 Feb 2025 08:47:45 -0600 Subject: [PATCH 3/7] Update tests/conftest.py fix linting error --- tests/conftest.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 749dd1d41..712ab9679 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -108,7 +108,6 @@ def pytest_generate_tests(metafunc): # setup config fixture to get all of the results from config_generator def make_test_id(config): return f"{config['environment_manager']}-{config['dependency_file']}-{config['docs']}" - if "config" in metafunc.fixturenames: metafunc.parametrize( "config", From 5268f331cd4fcf6df757eadb023dc3c3d5ea19fd Mon Sep 17 00:00:00 2001 From: Chris Kucharczyk Date: Sun, 16 Feb 2025 08:51:26 -0600 Subject: [PATCH 4/7] Update tests/conftest.py trying again to fix linting --- tests/conftest.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/conftest.py b/tests/conftest.py index 712ab9679..45e4c8abc 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -108,6 +108,7 @@ def pytest_generate_tests(metafunc): # setup config fixture to get all of the results from config_generator def make_test_id(config): return f"{config['environment_manager']}-{config['dependency_file']}-{config['docs']}" + if "config" in metafunc.fixturenames: metafunc.parametrize( "config", From fae8780c5b1b5225394c990bb6fb9fb8f2ae9813 Mon Sep 17 00:00:00 2001 From: Chris Kucharczyk Date: Sun, 16 Feb 2025 14:56:46 +0000 Subject: [PATCH 5/7] fix trailing comma --- tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 45e4c8abc..ebd007af7 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -113,7 +113,7 @@ def make_test_id(config): metafunc.parametrize( "config", config_generator(metafunc.config.getoption("fast")), - ids=make_test_id + ids=make_test_id, ) From e43eccf9eab54fa4556dcccd388ff5a76fdcc206 Mon Sep 17 00:00:00 2001 From: Chris Kucharczyk Date: Tue, 4 Mar 2025 10:48:12 +0000 Subject: [PATCH 6/7] revert gitignore and pyproject.toml changes --- .gitignore | 9 +-------- pyproject.toml | 4 ---- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 94e7013f2..2f91f4ed0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,16 +8,9 @@ manual_test/ # other local dev info .vscode/ -.history/ # Mac OS-specific storage files .DS_Store -Icon? -Icon -Icon[\r] - -# ruff -.ruff_cache/ # vim *.swp @@ -181,4 +174,4 @@ cython_debug/ # be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore # and can be added to the global gitignore or merged into this file. For a more nuclear # option (not recommended) you can uncomment the following to ignore the entire idea folder. -#.idea/ \ No newline at end of file +#.idea/ diff --git a/pyproject.toml b/pyproject.toml index 207a6daab..86619ee4e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,7 +42,3 @@ ccds = "ccds.__main__:main" "Source Code" = "https://github.com/drivendataorg/cookiecutter-data-science/" "Bug Tracker" = "https://github.com/drivendataorg/cookiecutter-data-science/issues" "DrivenData" = "https://drivendata.co" - -[tool.pytest.ini_options] -testpaths = "./tests" -addopts = "-vv --color=yes" \ No newline at end of file From 38463ce638dad99d0c558a7f27b7a7616e0ea7b5 Mon Sep 17 00:00:00 2001 From: Chris Kucharczyk Date: Tue, 4 Mar 2025 04:48:26 -0600 Subject: [PATCH 7/7] Update tests/conftest.py --- tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index ebd007af7..151ccd8a4 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -107,7 +107,7 @@ def fast(request): def pytest_generate_tests(metafunc): # setup config fixture to get all of the results from config_generator def make_test_id(config): - return f"{config['environment_manager']}-{config['dependency_file']}-{config['docs']}" + return f"{config['environment_manager']}-{config['dependency_file']}-{config['pydata_packages']}" if "config" in metafunc.fixturenames: metafunc.parametrize(