From d23a5f38869e90d8f905b0f4232c3d220dbbbbc1 Mon Sep 17 00:00:00 2001 From: William Woodruff Date: Wed, 1 Nov 2023 14:02:56 -0400 Subject: [PATCH 1/3] pypi_formula_mappings: extra_packages for python@X Signed-off-by: William Woodruff --- pypi_formula_mappings.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pypi_formula_mappings.json b/pypi_formula_mappings.json index 7cb3ba3e2489..0de1a89a02c3 100644 --- a/pypi_formula_mappings.json +++ b/pypi_formula_mappings.json @@ -844,6 +844,24 @@ "pyspelling": { "exclude_packages": ["lxml", "markdown", "PyYAML", "six"] }, + "python@3.7": { + "extra_packages": ["setuptools", "pip", "wheel"] + }, + "python@3.8": { + "extra_packages": ["setuptools", "pip", "wheel"] + }, + "python@3.9": { + "extra_packages": ["setuptools", "pip", "wheel"] + }, + "python@3.10": { + "extra_packages": ["setuptools", "pip", "wheel"] + }, + "python@3.11": { + "extra_packages": ["setuptools", "pip", "wheel"] + }, + "python@3.12": { + "extra_packages": ["setuptools", "pip", "wheel"] + }, "python-build": { "exclude_packages": ["packaging", "pyproject-hooks"] }, From 7bc290b1473045a983aac3168abf9ccedbd0bb71 Mon Sep 17 00:00:00 2001 From: William Woodruff Date: Wed, 1 Nov 2023 14:21:43 -0400 Subject: [PATCH 2/3] include flit-core, drop 3.7 due to EOL Signed-off-by: William Woodruff --- pypi_formula_mappings.json | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pypi_formula_mappings.json b/pypi_formula_mappings.json index 0de1a89a02c3..94476e23f5db 100644 --- a/pypi_formula_mappings.json +++ b/pypi_formula_mappings.json @@ -844,23 +844,20 @@ "pyspelling": { "exclude_packages": ["lxml", "markdown", "PyYAML", "six"] }, - "python@3.7": { - "extra_packages": ["setuptools", "pip", "wheel"] - }, "python@3.8": { - "extra_packages": ["setuptools", "pip", "wheel"] + "extra_packages": ["flit-core", "setuptools", "pip", "wheel"] }, "python@3.9": { - "extra_packages": ["setuptools", "pip", "wheel"] + "extra_packages": ["flit-core", "setuptools", "pip", "wheel"] }, "python@3.10": { - "extra_packages": ["setuptools", "pip", "wheel"] + "extra_packages": ["flit-core", "setuptools", "pip", "wheel"] }, "python@3.11": { - "extra_packages": ["setuptools", "pip", "wheel"] + "extra_packages": ["flit-core", "setuptools", "pip", "wheel"] }, "python@3.12": { - "extra_packages": ["setuptools", "pip", "wheel"] + "extra_packages": ["flit-core", "setuptools", "pip", "wheel"] }, "python-build": { "exclude_packages": ["packaging", "pyproject-hooks"] From 1220e84afab9d15294c9b25129deb48145bbb17a Mon Sep 17 00:00:00 2001 From: William Woodruff Date: Wed, 1 Nov 2023 14:28:09 -0400 Subject: [PATCH 3/3] pypi_formula_mappings: drop flit-core from 3.8 Not needed. Signed-off-by: William Woodruff --- pypi_formula_mappings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pypi_formula_mappings.json b/pypi_formula_mappings.json index 94476e23f5db..0609ff2b9d14 100644 --- a/pypi_formula_mappings.json +++ b/pypi_formula_mappings.json @@ -845,7 +845,7 @@ "exclude_packages": ["lxml", "markdown", "PyYAML", "six"] }, "python@3.8": { - "extra_packages": ["flit-core", "setuptools", "pip", "wheel"] + "extra_packages": ["setuptools", "pip", "wheel"] }, "python@3.9": { "extra_packages": ["flit-core", "setuptools", "pip", "wheel"]