From d307f64aa85766af67d83063187e959a8a85972c Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Thu, 4 Dec 2025 18:43:00 +0100 Subject: [PATCH] [s2i] Move direct dependencies from packages to source This is to simplify packages management. In the long run it will help a lot when switching Python version and base distribution. --- main-packages-list.ocp | 44 +++++++++++------------------------------- requirements.cachito | 43 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 34 deletions(-) diff --git a/main-packages-list.ocp b/main-packages-list.ocp index 4baf9e8ba..f9c3394c0 100644 --- a/main-packages-list.ocp +++ b/main-packages-list.ocp @@ -12,74 +12,52 @@ ipxe-bootimgs-aarch64 ipxe-bootimgs-x86 ipxe-roms-qemu mod_ssl -python3.12-automaton >= 3.2.0-0.20250214184705.9255778.el9 python3.12-babel >= 2.9.1-2.el9 python3.12-certifi >= 2020.12.5-2.1.el9 python3.12-charset-normalizer -python3.12-cheroot >= 10.0.1-5.el9 python3.12-cliff >= 4.9.1 -python3.12-construct -python3.12-cotyledon >= 2.0.0-1 python3.12-debtcollector >= 3.0.0-0.20250214185317.0e6ce1c.el9 python3.12-defusedxml >= 0.7.1-1.el9 python3.12-eventlet >= 0.40.1-1.el9ocp python3.12-flask >= 1:2.2.5-3.1.el9ocp -python3.12-futurist >= 3.2.1 python3.12-gunicorn >= 20.0.4-4.1.el9ocp +python3.12-hatch-fancy-pypi-readme +python3.12-hatch-vcs +python3.12-hatchling >= 1.21.1-1.1.el9ocp python3.12-inotify >= 0.9.6-26.el9ocp python3.12-ironic-prometheus-exporter >= 4.7.0-1.el9ocp -python3.12-ironicclient >= 4.9.0-0.20211209154934.6f1be06.el9 +python3.12-iso8601 >= 2.1.0-1.el9ocp python3.12-jinja2 >= 3.1.6-1.el9 python3.12-jsonpath-rw -python3.12-jsonschema >= 4.0.0 +python3.12-jsonschema-specifications >= 2023.12.1-1.el9ocp +python3.12-pyjwt >= 2.4.0-1.el9ocp python3.12-keyring >= 25.6.0 -python3.12-keystoneauth1 >= 5.10.0 -python3.12-keystoneclient >= 5.6.0 -python3.12-keystonemiddleware >= 10.9.0 -python3.12-lark >= 1.2.2 python3.12-markupsafe >= 2.1.1-4.el9 python3.12-microversion-parse >= 1.0.1-0.20240424173932.2c36df6.el9 python3.12-msgpack >= 0.6.2-2.el9 python3.12-netaddr >= 0.10.1-2.el9 -python3.12-openstacksdk >= 4.4.0 -python3.12-os-traits >= 3.3.0 python3.12-osc-lib >= 3.2.0 -python3.12-oslo-cache >= 3.10.1 -python3.12-oslo-concurrency >= 7.1.0 -python3.12-oslo-config >= 9.7.1 -python3.12-oslo-context >= 5.7.1 -python3.12-oslo-db >= 17.2.1 -python3.12-oslo-i18n >= 6.5.1 -python3.12-oslo-log >= 7.1.0 -python3.12-oslo-messaging >= 16.1.0 -python3.12-oslo-metrics >= 0.11.0 -python3.12-oslo-middleware >= 6.3.1 -python3.12-oslo-policy >= 4.5.1 -python3.12-oslo-serialization >= 5.7.0 -python3.12-oslo-service >= 4.3.0 -python3.12-oslo-upgradecheck >= 2.5.0 -python3.12-oslo-utils >= 8.2.0 -python3.12-oslo-versionedobjects >= 3.6.0 +python3.12-oslo-cache >= 3.12.0-1.el9ocp python3.12-osprofiler >= 4.2.0-0.20250214190140.3fb0487.el9 python3.12-packaging >= 20.4-2.el9 python3.12-paste >= 3.5.0-3.el9.1 python3.12-paste-deploy >= 2.0.1-5.el9 -python3.12-pbr >= 6.0.0-1.el9 python3.12-pecan python3.12-pint >= 0.10.1-3.el9 python3.12-psutil python3.12-pyasn1 >= 0.5.1-3.el9 python3.12-pyasn1-modules >= 0.5.1-3.el9 +python3.12-pycadf python3.12-pycdlib python3.12-pyghmi >= 1.5.14-2.1.el9ost python3.12-pysnmp-lextudio >= 5.0.33-1.el9 -python3.12-requests >= 2.32.3-2.el9 python3.12-retrying python3.12-setproctitle >= 1.3.7-1 python3.12-smi-lextudio >= 1.1.13-0.1.el9 -python3.12-stevedore >= 5.4.1 -python3.12-tooz >= 6.3.0-0.20240926164120.734acc4.el9 +python3.12-testresources >= 2.0.1 +python3.12-testscenarios >= 0.5.0 python3.12-typing-extensions >= 4.12.2-2.el9 +python3.12-voluptuous >= 0.11.7-3.1.el9ocp python3.12-waitress >= 3.0.1-1.el9 python3.12-webob >= 1.8.8-2.el9 python3.12-websockify >= 0.9.0 diff --git a/requirements.cachito b/requirements.cachito index c16b1cf32..41766b709 100644 --- a/requirements.cachito +++ b/requirements.cachito @@ -1,7 +1,48 @@ ironic @ git+https://github.com/openshift/openstack-ironic@67041b9d76138242904831794c97d8412bcbe6fb sushy @ git+https://github.com/openshift/openstack-sushy@645958fda87b06137c7394ef9e36ca38cc7c575c +# HARDWARE DRIVERS DEPENDENCIES proliantutils===2.16.3 python-scciclient===0.17.0 -# DEPENDENCIES +# DIRECT DEPENDENCIES +alembic===1.14.0 +automaton===3.3.0 +bcrypt===4.3.0 +cheroot===11.0.0 +construct===2.10.70 +cotyledon===2.0.0 +futurist===3.2.1 +jsonpatch===1.33 +jsonschema===4.19.2 +keystoneauth1===5.12.0 +keystonemiddleware===10.12.0 +lark===1.3.0 +openstacksdk===4.8.0 +os-service-types===1.8.0 +os-traits===3.5.0 +oslo.concurrency===7.2.0 +oslo.config===10.1.0 +oslo.db===17.4.0 +oslo.log===7.2.1 +oslo.messaging===17.1.0 +oslo.middleware===7.0.0 +oslo.policy===4.7.0 +oslo.serialization===5.8.0 +oslo.service===4.4.1 +oslo.upgradecheck===2.6.0 +oslo.utils===9.2.0 +oslo.versionedobjects===3.8.0 +pbr===7.0.3 +requests===2.32.5 +SQLAlchemy===2.0.44 +stevedore===5.6.0 +tenacity===9.1.2 +tooz===6.3.0 + +# TRANSITIVE DEPENDENCIES +# This list should be kept as small as possible +dogpile.cache===1.3.3 +python-ironicclient===5.14.0 +python-keystoneclient===5.7.0 +tzdata===2025.2