From 9bcdcdcbd6eec891ac83c7b162d886acdf695447 Mon Sep 17 00:00:00 2001 From: Daniel Holth Date: Wed, 6 Dec 2023 09:34:44 -0500 Subject: [PATCH 1/4] add pip check to recipe tests --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 886e8390a5..d635701182 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -79,6 +79,7 @@ test: - conda debug --help # bdist_conda - python test_bdist_conda_setup.py bdist_conda --help + - python -m pip check about: home: https://conda.org From ff06d9abb3a065646b9091cc4586b447aa2bbc26 Mon Sep 17 00:00:00 2001 From: Daniel Holth Date: Wed, 6 Dec 2023 09:44:38 -0500 Subject: [PATCH 2/4] add pip to test requires --- recipe/meta.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d635701182..8fb147cf14 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -52,6 +52,8 @@ requirements: - requests - tomli # [py<311] - tqdm + test: + - pip run_constrained: - conda-verify >=3.1.0 @@ -64,6 +66,7 @@ test: files: - test_bdist_conda_setup.py commands: + - python -m pip check # builtin subcommands - conda --help - conda build --help @@ -79,7 +82,6 @@ test: - conda debug --help # bdist_conda - python test_bdist_conda_setup.py bdist_conda --help - - python -m pip check about: home: https://conda.org From e7f572b091c8502a05e217a6e912e61a3d937078 Mon Sep 17 00:00:00 2001 From: Daniel Holth Date: Wed, 6 Dec 2023 09:50:53 -0500 Subject: [PATCH 3/4] update recipe --- recipe/meta.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8fb147cf14..1fd9801ca5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -52,8 +52,6 @@ requirements: - requests - tomli # [py<311] - tqdm - test: - - pip run_constrained: - conda-verify >=3.1.0 @@ -63,6 +61,9 @@ test: - conda_build # new/updated submodules (can be dropped after 1-2 releases) - conda_build.index + requires: + - setuptools + - pip files: - test_bdist_conda_setup.py commands: From c0b8ca56ef93247fc74c29eb148d0b89aed7578a Mon Sep 17 00:00:00 2001 From: Daniel Holth Date: Wed, 6 Dec 2023 10:06:14 -0500 Subject: [PATCH 4/4] conda packgae has no pip metadata; remove pyproject lief dependency --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index fe8d97e26c..a3477043d0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,7 +36,6 @@ dependencies = [ "jinja2", "jsonschema >=4.19", "libarchive-c", - "lief", "menuinst", "packaging", "pkginfo",