From 9bc27c4203cb6454369829684affe060ae0be4c1 Mon Sep 17 00:00:00 2001 From: Sander van Rijn Date: Tue, 30 Jul 2024 17:36:19 +0200 Subject: [PATCH 1/3] switch project tests to use copie_session fixture --- tests/test_project.py | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/tests/test_project.py b/tests/test_project.py index 58504fa8..763d4e6a 100644 --- a/tests/test_project.py +++ b/tests/test_project.py @@ -57,23 +57,27 @@ def project_env_bin_dir(tmp_path_factory): @pytest.fixture(scope='session') -def baked_with_development_dependencies(tmp_path_factory, project_env_bin_dir, copier_project_defaults): - project_defaults = copier_project_defaults - project = run_copy( - src_path=str(here()), - dst_path=str(tmp_path_factory.mktemp('projects')), - defaults=True, - vcs_ref="HEAD", - data=project_defaults - ) - project_dir = project.dst_path +# def baked_with_development_dependencies(tmp_path_factory, project_env_bin_dir, copier_project_defaults): +# project_defaults = copier_project_defaults +# project = run_copy( +# src_path=str(here()), +# dst_path=str(tmp_path_factory.mktemp('projects')), +# defaults=True, +# vcs_ref="HEAD", +# data=project_defaults +# ) +# project_dir = project.dst_path + +def baked_with_development_dependencies(copie_session, project_env_bin_dir, copier_project_defaults): + result = copie_session.copy(extra_answers=copier_project_defaults) + assert result.exit_code == 0 bin_dir = project_env_bin_dir - latest_pip_output = run([f'{bin_dir}python', '-m', 'pip', 'install', '--upgrade', 'pip', 'setuptools'], project_dir) + latest_pip_output = run([f'{bin_dir}python', '-m', 'pip', 'install', '--upgrade', 'pip', 'setuptools'], result.project_dir) assert latest_pip_output.returncode == 0 - pip_output = run([f'{bin_dir}python', '-m', 'pip', 'install', '--editable', '.[dev]'], project_dir) + pip_output = run([f'{bin_dir}python', '-m', 'pip', 'install', '--editable', '.[dev]'], result.project_dir) assert pip_output.returncode == 0 - return project_dir + return result.project_dir def test_pytest(baked_with_development_dependencies, project_env_bin_dir): From 7caf61e52bfc3cc953120a40f1c1712dbb6921ba Mon Sep 17 00:00:00 2001 From: Sander van Rijn Date: Thu, 1 Aug 2024 11:29:20 +0200 Subject: [PATCH 2/3] clean up pyprojroot.here references --- setup.cfg | 1 - tests/test_project.py | 19 ++++--------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/setup.cfg b/setup.cfg index a0edb730..f97148eb 100644 --- a/setup.cfg +++ b/setup.cfg @@ -44,7 +44,6 @@ dev = coverage [toml] pytest pytest-copie - pyprojroot [tool:pytest] diff --git a/tests/test_project.py b/tests/test_project.py index 763d4e6a..a2b5a35f 100644 --- a/tests/test_project.py +++ b/tests/test_project.py @@ -4,7 +4,6 @@ from sys import platform from typing import Sequence -from pyprojroot.here import here from copier import run_copy import pytest @@ -57,27 +56,17 @@ def project_env_bin_dir(tmp_path_factory): @pytest.fixture(scope='session') -# def baked_with_development_dependencies(tmp_path_factory, project_env_bin_dir, copier_project_defaults): -# project_defaults = copier_project_defaults -# project = run_copy( -# src_path=str(here()), -# dst_path=str(tmp_path_factory.mktemp('projects')), -# defaults=True, -# vcs_ref="HEAD", -# data=project_defaults -# ) -# project_dir = project.dst_path - def baked_with_development_dependencies(copie_session, project_env_bin_dir, copier_project_defaults): result = copie_session.copy(extra_answers=copier_project_defaults) assert result.exit_code == 0 + project_dir = result.project_dir bin_dir = project_env_bin_dir - latest_pip_output = run([f'{bin_dir}python', '-m', 'pip', 'install', '--upgrade', 'pip', 'setuptools'], result.project_dir) + latest_pip_output = run([f'{bin_dir}python', '-m', 'pip', 'install', '--upgrade', 'pip', 'setuptools'], project_dir) assert latest_pip_output.returncode == 0 - pip_output = run([f'{bin_dir}python', '-m', 'pip', 'install', '--editable', '.[dev]'], result.project_dir) + pip_output = run([f'{bin_dir}python', '-m', 'pip', 'install', '--editable', '.[dev]'], project_dir) assert pip_output.returncode == 0 - return result.project_dir + return project_dir def test_pytest(baked_with_development_dependencies, project_env_bin_dir): From 982a89eadec9c4cecd5fba04a500eef130b13cec Mon Sep 17 00:00:00 2001 From: Sander van Rijn Date: Sun, 2 Feb 2025 22:43:04 +0100 Subject: [PATCH 3/3] Set minimum version for pytest-copie --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index f97148eb..f82fc793 100644 --- a/setup.cfg +++ b/setup.cfg @@ -43,7 +43,7 @@ install_requires = dev = coverage [toml] pytest - pytest-copie + pytest-copie>=0.2.1 [tool:pytest]