From c4e4d3b806a866f77fcaace5162e84cd4839e514 Mon Sep 17 00:00:00 2001 From: Antonio Carlos Royo Date: Fri, 23 Jan 2026 11:11:54 -0500 Subject: [PATCH] deps: Update requirements-build.txt (PROJQUAY-10272) (#4948) * [redhat-3.10] deps: updating setuptools-rust (#4862) deps: updating setuptools-rust Co-authored-by: bcaton Co-authored-by: Antonio Carlos Royo * [redhat-3.10] Adding calver to requirements-build.txt (#4858) removing unused requirements-build-osbs.txt and adding calver to requirements-build.txt Co-authored-by: bcaton * [redhat-3.10] deps: Update hatchling to 1.27.0 (PROJQUAY-10085) (#4878) Update hatchling to 1.27.0 Co-authored-by: Antonio Carlos Royo * [redhat-3.10] deps: Update hatch-vcs to 0.4.0 (PROJQUAY-10085) (#4885) Update hatch-vcs to 0.4.0 Co-authored-by: Antonio Carlos Royo * [redhat-3.10] deps: Update setuptools-scm to 9.2.0 (PROJQUAY-10085) (#4894) Update setuptools-scm to 9.2.0 Co-authored-by: Antonio Carlos Royo * [redhat-3.10] deps: Update trove-classifiers to 2025.9.11.17 (PROJQUAY-10085) (#4904) Update trove-classifiers to 2025.9.11.17 Co-authored-by: Antonio Carlos Royo * [redhat-3.10] init: dynamically looking up python user base (PROJQUAY-9011) (#4930) * dynamically looking up python user base * commenting out to see if this is causing pipeline failure * using different cert install approach depending on ubi version --------- Co-authored-by: bcaton --------- Co-authored-by: OpenShift Cherrypick Robot Co-authored-by: bcaton Co-authored-by: Antonio Carlos Royo --- conf/init/certs_install.sh | 24 +++++--- requirements-build.txt | 110 ++++++++++++++++++++++++++++++++++--- 2 files changed, 117 insertions(+), 17 deletions(-) diff --git a/conf/init/certs_install.sh b/conf/init/certs_install.sh index a4f5f6d36..67e968f47 100755 --- a/conf/init/certs_install.sh +++ b/conf/init/certs_install.sh @@ -5,7 +5,11 @@ QUAYCONF=${QUAYCONF:-"$QUAYPATH/conf"} QUAYCONFIG=${QUAYCONFIG:-"$QUAYCONF/stack"} CERTDIR=${CERTDIR:-"$QUAYCONFIG/extra_ca_certs"} SYSTEM_CERTDIR=${SYSTEM_CERTDIR:-"/etc/pki/ca-trust/source/anchors"} -PYTHONUSERBASE_SITE_PACKAGE=/opt/app-root/lib/python3.12/site-packages +if grep -q 'VERSION_ID="8' /etc/os-release; then + PYTHONUSERBASE_SITE_PACKAGE=${PYTHONUSERBASE_SITE_PACKAGE:-"$(python -m site --user-site)"} +else + PYTHONUSERBASE_SITE_PACKAGE=/opt/app-root/lib/python3.12/site-packages +fi cd ${QUAYDIR:-"/quay-registry"} @@ -65,10 +69,14 @@ done # Update all CA certificates. # hack for UBI9, extract it a temp location and move -# to /etc/pki after because of permission issues - -mkdir -p /tmp/extracted -rm -rf /etc/pki/ca-trust/extracted -update-ca-trust extract -o /tmp/extracted -chmod ug+w -R /tmp/extracted -mv /tmp/extracted /etc/pki/ca-trust +# to /etc/pki after because of permission issues. +# All ubi8 specific code should be removed after UBI9 is fully supported, see PROJQUAY-9013 +if grep -q 'VERSION_ID="8' /etc/os-release; then + update-ca-trust extract +else + mkdir -p /tmp/extracted + rm -rf /etc/pki/ca-trust/extracted + update-ca-trust extract -o /tmp/extracted + chmod ug+w -R /tmp/extracted + mv /tmp/extracted /etc/pki/ca-trust +fi diff --git a/requirements-build.txt b/requirements-build.txt index 7449f0680..6d60e47d1 100644 --- a/requirements-build.txt +++ b/requirements-build.txt @@ -11,11 +11,82 @@ cython==3.0.2 # via -r requirements-build.in flit-core==3.10.1 # via -r requirements-build.in -greenlet==3.1.1 +greenlet==3.2.2 \ + --hash=sha256:00cd814b8959b95a546e47e8d589610534cfb71f19802ea8a2ad99d95d702057 \ + --hash=sha256:02a98600899ca1ca5d3a2590974c9e3ec259503b2d6ba6527605fcd74e08e207 \ + --hash=sha256:02f5972ff02c9cf615357c17ab713737cccfd0eaf69b951084a9fd43f39833d3 \ + --hash=sha256:055916fafad3e3388d27dd68517478933a97edc2fc54ae79d3bec827de2c64c4 \ + --hash=sha256:0a16fb934fcabfdfacf21d79e6fed81809d8cd97bc1be9d9c89f0e4567143d7b \ + --hash=sha256:1592a615b598643dbfd566bac8467f06c8c8ab6e56f069e573832ed1d5d528cc \ + --hash=sha256:1919cbdc1c53ef739c94cf2985056bcc0838c1f217b57647cbf4578576c63825 \ + --hash=sha256:1e4747712c4365ef6765708f948acc9c10350719ca0545e362c24ab973017370 \ + --hash=sha256:1e76106b6fc55fa3d6fe1c527f95ee65e324a13b62e243f77b48317346559708 \ + --hash=sha256:1f72667cc341c95184f1c68f957cb2d4fc31eef81646e8e59358a10ce6689457 \ + --hash=sha256:2593283bf81ca37d27d110956b79e8723f9aa50c4bcdc29d3c0543d4743d2763 \ + --hash=sha256:2dc5c43bb65ec3669452af0ab10729e8fdc17f87a1f2ad7ec65d4aaaefabf6bf \ + --hash=sha256:3091bc45e6b0c73f225374fefa1536cd91b1e987377b12ef5b19129b07d93ebe \ + --hash=sha256:354f67445f5bed6604e493a06a9a49ad65675d3d03477d38a4db4a427e9aad0e \ + --hash=sha256:3885f85b61798f4192d544aac7b25a04ece5fe2704670b4ab73c2d2c14ab740d \ + --hash=sha256:3ab7194ee290302ca15449f601036007873028712e92ca15fc76597a0aeb4c59 \ + --hash=sha256:3aeca9848d08ce5eb653cf16e15bb25beeab36e53eb71cc32569f5f3afb2a3aa \ + --hash=sha256:44671c29da26539a5f142257eaba5110f71887c24d40df3ac87f1117df589e0e \ + --hash=sha256:45f9f4853fb4cc46783085261c9ec4706628f3b57de3e68bae03e8f8b3c0de51 \ + --hash=sha256:4bd139e4943547ce3a56ef4b8b1b9479f9e40bb47e72cc906f0f66b9d0d5cab3 \ + --hash=sha256:4fefc7aa68b34b9224490dfda2e70ccf2131368493add64b4ef2d372955c207e \ + --hash=sha256:6629311595e3fe7304039c67f00d145cd1d38cf723bb5b99cc987b23c1433d61 \ + --hash=sha256:6fadd183186db360b61cb34e81117a096bff91c072929cd1b529eb20dd46e6c5 \ + --hash=sha256:71566302219b17ca354eb274dfd29b8da3c268e41b646f330e324e3967546a74 \ + --hash=sha256:7409796591d879425997a518138889d8d17e63ada7c99edc0d7a1c22007d4907 \ + --hash=sha256:752f0e79785e11180ebd2e726c8a88109ded3e2301d40abced2543aa5d164275 \ + --hash=sha256:7791dcb496ec53d60c7f1c78eaa156c21f402dda38542a00afc3e20cae0f480f \ + --hash=sha256:782743700ab75716650b5238a4759f840bb2dcf7bff56917e9ffdf9f1f23ec59 \ + --hash=sha256:7c9896249fbef2c615853b890ee854f22c671560226c9221cfd27c995db97e5c \ + --hash=sha256:85f3e248507125bf4af607a26fd6cb8578776197bd4b66e35229cdf5acf1dfbf \ + --hash=sha256:89c69e9a10670eb7a66b8cef6354c24671ba241f46152dd3eed447f79c29fb5b \ + --hash=sha256:8cb8553ee954536500d88a1a2f58fcb867e45125e600e80f586ade399b3f8819 \ + --hash=sha256:9ae572c996ae4b5e122331e12bbb971ea49c08cc7c232d1bd43150800a2d6c65 \ + --hash=sha256:9c7b15fb9b88d9ee07e076f5a683027bc3befd5bb5d25954bb633c385d8b737e \ + --hash=sha256:9ea5231428af34226c05f927e16fc7f6fa5e39e3ad3cd24ffa48ba53a47f4240 \ + --hash=sha256:a31ead8411a027c2c4759113cf2bd473690517494f3d6e4bf67064589afcd3c5 \ + --hash=sha256:a8fa80665b1a29faf76800173ff5325095f3e66a78e62999929809907aca5659 \ + --hash=sha256:ad053d34421a2debba45aa3cc39acf454acbcd025b3fc1a9f8a0dee237abd485 \ + --hash=sha256:b24c7844c0a0afc3ccbeb0b807adeefb7eff2b5599229ecedddcfeb0ef333bec \ + --hash=sha256:b50a8c5c162469c3209e5ec92ee4f95c8231b11db6a04db09bbe338176723bb8 \ + --hash=sha256:ba30e88607fb6990544d84caf3c706c4b48f629e18853fc6a646f82db9629418 \ + --hash=sha256:bf3fc9145141250907730886b031681dfcc0de1c158f3cc51c092223c0f381ce \ + --hash=sha256:c23ea227847c9dbe0b3910f5c0dd95658b607137614eb821e6cbaecd60d81cc6 \ + --hash=sha256:c3cc1a3ed00ecfea8932477f729a9f616ad7347a5e55d50929efa50a86cb7be7 \ + --hash=sha256:c49e9f7c6f625507ed83a7485366b46cbe325717c60837f7244fc99ba16ba9d6 \ + --hash=sha256:d0cb7d47199001de7658c213419358aa8937df767936506db0db7ce1a71f4a2f \ + --hash=sha256:d8009ae46259e31bc73dc183e402f548e980c96f33a6ef58cc2e7865db012e13 \ + --hash=sha256:da956d534a6d1b9841f95ad0f18ace637668f680b1339ca4dcfb2c1837880a0b \ + --hash=sha256:dcb9cebbf3f62cb1e5afacae90761ccce0effb3adaa32339a0670fe7805d8068 \ + --hash=sha256:decb0658ec19e5c1f519faa9a160c0fc85a41a7e6654b3ce1b44b939f8bf1325 \ + --hash=sha256:df4d1509efd4977e6a844ac96d8be0b9e5aa5d5c77aa27ca9f4d3f92d3fcf330 \ + --hash=sha256:eeb27bece45c0c2a5842ac4c5a1b5c2ceaefe5711078eed4e8043159fa05c834 \ + --hash=sha256:efcdfb9df109e8a3b475c016f60438fcd4be68cd13a365d42b35914cdab4bb2b \ + --hash=sha256:fd9fb7c941280e2c837b603850efc93c999ae58aae2b40765ed682a6907ebbc5 \ + --hash=sha256:fe46d4f8e94e637634d54477b0cfabcf93c53f29eedcbdeecaf2af32029b4421 # via -r requirements-build.in +hatch-fancy-pypi-readme==25.1.0 \ + --hash=sha256:9c58ed3dff90d51f43414ce37009ad1d5b0f08ffc9fc216998a06380f01c0045 \ + --hash=sha256:ce0134c40d63d874ac48f48ccc678b8f3b62b8e50e9318520d2bffc752eedaf3 + # via -r requirements-build.in +hatch-vcs==0.4.0 \ + --hash=sha256:093810748fe01db0d451fabcf2c1ac2688caefd232d4ede967090b1c1b07d9f7 \ + --hash=sha256:b8a2b6bee54cf6f9fc93762db73890017ae59c9081d1038a41f16235ceaf8b2c + # via -r requirements-build.in +hatchling==1.27.0 \ + --hash=sha256:971c296d9819abb3811112fc52c7a9751c8d381898f36533bb16f9791e941fd6 \ + --hash=sha256:d3a2f3567c4f926ea39849cdf924c7e99e6686c9c8e288ae1037c8fa2a5d937b + # via + # -r requirements-build.in + # hatch-fancy-pypi-readme + # hatch-vcs packaging==24.2 # via # -r requirements-build.in + # hatchling # setuptools-scm pbr==6.1.0 # via -r requirements-build.in @@ -23,20 +94,34 @@ pycparser==2.22 # via # -r requirements-build.in # cffi -semantic-version==2.10.0 +semantic-version==2.10.0 \ + --hash=sha256:bdabb6d336998cbb378d4b9db3a4b56a1e3235701dc05ea2690d9a997ed5041c \ + --hash=sha256:de78a3b8e0feda74cabc54aab2da702113e33ac9d9eb9d2389bcf1f58b7d9177 + # via setuptools-rust +setuptools-rust==1.11.0 \ + --hash=sha256:61739c016f7ba9e114d68e0ddf92d204748c17d3e55492693aa743d70b9a335e \ + --hash=sha256:f765d66f3def6fdc85e1e6d889c6a812aea1430c8dadcf1c7b6779b45f874fb2 + # via -r requirements-build.in +setuptools-scm==9.2.0 \ + --hash=sha256:6662c9b9497b6c9bf13bead9d7a9084756f68238302c5ed089fb4dbd29d102d7 \ + --hash=sha256:c551ef54e2270727ee17067881c9687ca2aedf179fa5b8f3fab9e8d73bdc421f # via # -r requirements-build.in - # setuptools-rust -setuptools-rust==1.10.2 - # via -r requirements-build.in -setuptools-scm[toml]==8.1.0 - # via -r requirements-build.in -six==1.17.0 + # hatch-vcs +six==1.16.0 \ + --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \ + --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 # via -r requirements-build.in tomli==2.2.1 # via # -r requirements-build.in # setuptools-scm +trove-classifiers==2025.9.11.17 \ + --hash=sha256:5d392f2d244deb1866556457d6f3516792124a23d1c3a463a2e8668a5d1c15dd \ + --hash=sha256:931ca9841a5e9c9408bc2ae67b50d28acf85bef56219b56860876dd1f2d024dd + # via + # -r requirements-build.in + # hatchling typing-extensions==4.12.2 # via # -r requirements-build.in @@ -44,8 +129,15 @@ typing-extensions==4.12.2 wheel==0.45.1 # via -r requirements-build.in +calver==2022.6.26 \ + --hash=sha256:a1d7fcdd67797afc52ee36ffb8c8adf6643173864306547bfd1380cbce6310a0 \ + --hash=sha256:e05493a3b17517ef1748fbe610da11f10485faa7c416b9d33fd4a52d74894f8b + # via -r requirements-build.in + # The following packages are considered to be unsafe in a requirements file: -setuptools==75.6.0 +setuptools==80.9.0 \ + --hash=sha256:062d34222ad13e0cc312a4c02d73f059e86a4acbfbdea8f8f76b28c99f306922 \ + --hash=sha256:f36b47402ecde768dbfafc46e8e4207b4360c654f1f3bb84475f0a28628fb19c # via # -r requirements-build.in # setuptools-rust