Drop flit-core from pip deps. (#24445)

* py3-pip - drop flit-core as a runtime dependency. Pip itself does not have any imports of flit or flit_core. This was added in the pyversions refactor probably because of a misunderstood dependency. Several packages have a pyproject entry like wheel does: pyproject.toml:requires = ["flit_core >=3.8,<4"] pyproject.toml:build-backend = "flit_core.buildapi" And a simple 'pip build' will show a stack trace that doesn't actually even leave pip so it appears/appeared that pip had a flit_core dep. Reality is that flit-core should be in the build environment of those packages. * Add flit-core to dependencies of sepveral py3 packages. These py3 packages were building because pip had flit-core in its dependencies. They need to explicitly add it. With this change I can build py3-* that had either python-supported-pip or py3-pip. * Drop py3-pip-noflit This package was only added to provide pip without flit as a dependency. Flit-core is now removed from pip dep so it is not needed.
wolfi-dev · Jul 23, 2024 · c2af096 · c2af096
1 parent 12c1e97
commit c2af096
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 91 deletions.
diff --git a/py3-build.yaml b/py3-build.yaml
@@ -1,7 +1,7 @@
 package:
   name: py3-build
   version: 1.2.1
-  epoch: 3
+  epoch: 4
   description: A simple, correct Python build frontend
   copyright:
     - license: MIT
@@ -23,6 +23,7 @@ environment:
     packages:
       - busybox
       - ca-certificates-bundle
+      - py3-supported-flit-core
       - py3-supported-pip
       - py3-supported-python
       - wolfi-base

diff --git a/py3-flit-scm.yaml b/py3-flit-scm.yaml
@@ -1,7 +1,7 @@
 package:
   name: py3-flit-scm
   version: 1.7.0
-  epoch: 0
+  epoch: 1
   description: "A PEP 518 build backend that uses setuptools_scm and flit_core"
   copyright:
     - license: MIT
@@ -24,6 +24,7 @@ environment:
     packages:
       - build-base
       - busybox
+      - py3-supported-flit-core
       - py3-supported-packaging
       - py3-supported-pip
       - py3-supported-python

diff --git a/py3-gpep517.yaml b/py3-gpep517.yaml
@@ -1,7 +1,7 @@
 package:
   name: py3-gpep517
   version: "16"
-  epoch: 1
+  epoch: 2
   description: "PEP517 build system support for distros"
   copyright:
     - license: MIT
@@ -23,6 +23,7 @@ environment:
     packages:
       - build-base
       - busybox
+      - py3-supported-flit-core
       - py3-supported-pip
       - py3-supported-python
       - py3-supported-setuptools

diff --git a/py3-packaging.yaml b/py3-packaging.yaml
@@ -1,7 +1,7 @@
 package:
   name: py3-packaging
   version: "24.1"
-  epoch: 1
+  epoch: 2
   description: "core utilities for python3 packaging"
   copyright:
     - license: Apache-2.0 AND BSD-2-Clause
@@ -24,6 +24,7 @@ environment:
       - build-base
       - busybox
       - ca-certificates-bundle
+      - py3-supported-flit-core
       - py3-supported-pip
       - py3-supported-python
       - wolfi-base

diff --git a/py3-pathspec.yaml b/py3-pathspec.yaml
@@ -1,7 +1,7 @@
 package:
   name: py3-pathspec
   version: 0.12.1
-  epoch: 2
+  epoch: 3
   description: "Utility library for gitignore style pattern matching of file paths"
   copyright:
     - license: MPL-2.0
@@ -23,6 +23,7 @@ environment:
     packages:
       - build-base
       - busybox
+      - py3-supported-flit-core
       - py3-supported-pip
       - py3-supported-python
 

diff --git a/py3-pip-noflit.yaml b/py3-pip-noflit.yaml
diff --git a/py3-pip.yaml b/py3-pip.yaml
@@ -1,7 +1,7 @@
 package:
   name: py3-pip
   version: 24.1.2
-  epoch: 0
+  epoch: 1
   description: The PyPA recommended tool for installing Python packages.
   copyright:
     - license: MIT
@@ -45,7 +45,6 @@ subpackages:
           python: python${{range.key}}
     dependencies:
       runtime:
-        - py${{range.key}}-flit-core
         - py${{range.key}}-setuptools
 
   - range: py-versions

diff --git a/py3-pyparsing.yaml b/py3-pyparsing.yaml
@@ -2,7 +2,7 @@
 package:
   name: py3-pyparsing
   version: 3.1.2
-  epoch: 3
+  epoch: 4
   description: pyparsing module - Classes and methods to define and execute parsing grammars
   copyright:
     - license: MIT
@@ -25,6 +25,7 @@ environment:
       - build-base
       - busybox
       - ca-certificates-bundle
+      - py3-supported-flit-core
       - py3-supported-pip
       - py3-supported-python
       - wolfi-base

diff --git a/py3-pyproject-hooks.yaml b/py3-pyproject-hooks.yaml
@@ -1,7 +1,7 @@
 package:
   name: py3-pyproject-hooks
   version: 1.1.0
-  epoch: 2
+  epoch: 3
   description: A low-level library for calling build-backends in `pyproject.toml`-based project
   copyright:
     - license: MIT
@@ -24,6 +24,7 @@ environment:
     packages:
       - busybox
       - ca-certificates-bundle
+      - py3-supported-flit-core
       - py3-supported-pip
       - py3-supported-python
       - wolfi-base

diff --git a/py3-pyproject-metadata.yaml b/py3-pyproject-metadata.yaml
@@ -1,7 +1,7 @@
 package:
   name: py3-pyproject-metadata
   version: 0.8.0
-  epoch: 0
+  epoch: 1
   description: PEP 621 metadata parsing
   copyright:
     - license: MIT
@@ -25,6 +25,7 @@ environment:
       - build-base
       - busybox
       - ca-certificates-bundle
+      - py3-supported-flit-core
       - py3-supported-pip
       - py3-supported-python
       - wolfi-base

diff --git a/py3-typing-extensions.yaml b/py3-typing-extensions.yaml
@@ -2,7 +2,7 @@
 package:
   name: py3-typing-extensions
   version: 4.12.2
-  epoch: 2
+  epoch: 3
   description: Backported and Experimental Type Hints for Python 3.7+
   copyright:
     - license: PSF-2.0
@@ -26,6 +26,7 @@ environment:
       - build-base
       - busybox
       - ca-certificates-bundle
+      - py3-supported-flit-core
       - py3-supported-installer
       - py3-supported-pip
       - py3-supported-python