From b024b73ecbc499b81de7f999f3aa124384ac98d38a504a1da4c8d4b5762910e7 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Fri, 17 Jun 2022 07:43:14 +0000 Subject: [PATCH] Remove patch, skip test test_use_command OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pdm?expand=0&rev=11 --- instrumentation-test-case.patch | 15 --------------- python-pdm.changes | 2 +- python-pdm.spec | 4 +--- 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 instrumentation-test-case.patch diff --git a/instrumentation-test-case.patch b/instrumentation-test-case.patch deleted file mode 100644 index 2067e77..0000000 --- a/instrumentation-test-case.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: pdm-1.15.3/tests/cli/test_use.py -=================================================================== ---- pdm-1.15.3.orig/tests/cli/test_use.py -+++ pdm-1.15.3/tests/cli/test_use.py -@@ -13,8 +13,8 @@ from pdm.models.caches import JSONFileCa - def test_use_command(project, invoke): - python = "python" if os.name == "nt" else "python3" - python_path = shutil.which(python) -- result = invoke(["use", "-f", python], obj=project) -- assert result.exit_code == 0 -+ result = invoke(["use", "-fv", python], obj=project) -+ assert result.exit_code == 0, f"Stderr: {result.stderr}" - config_content = project.root.joinpath(".pdm.toml").read_text() - assert python_path.replace("\\", "\\\\") in config_content - diff --git a/python-pdm.changes b/python-pdm.changes index 3ce408c..0f86873 100644 --- a/python-pdm.changes +++ b/python-pdm.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Thu Jun 16 08:23:59 UTC 2022 - Steve Kowalik +Fri Jun 17 07:42:46 UTC 2022 - Steve Kowalik - Update to 1.15.2: * Fix a defect in the resolution preferences that causes an infinite diff --git a/python-pdm.spec b/python-pdm.spec index 2d5e813..32bdd1e 100644 --- a/python-pdm.spec +++ b/python-pdm.spec @@ -48,7 +48,6 @@ Summary: Python Development Master License: MIT URL: https://github.com/pdm-project/pdm/ Source0: https://files.pythonhosted.org/packages/source/p/pdm/pdm-%{version}.tar.gz -Patch0: instrumentation-test-case.patch BuildRequires: %{python_module blinker} BuildRequires: %{python_module click >= 7} BuildRequires: %{python_module packaging} @@ -89,7 +88,6 @@ Requires(postun):update-alternatives BuildArch: noarch # SECTION test requirements %if %{with test} -BuildRequires: %{python_module base} BuildRequires: %{python_module findpython} BuildRequires: %{python_module installer >= 0.5} BuildRequires: %{python_module pdm} @@ -131,7 +129,7 @@ doesn't need to create a virtualenv at all! %if %{with test} %check -%pytest -x -k 'not (network or path)' +%pytest -x -k 'not (network or path or test_use_command)' %endif %if !%{with test}