Merge pull request #23562 from cevich/rm_docker_py_dupe

De-duplicate docker-py testing

Makefile

@@ -723,10 +723,6 @@ localapiv2-bash:
 localapiv2-python:
 	env CONTAINERS_CONF=$(CURDIR)/test/apiv2/containers.conf PODMAN=./bin/podman \
 		pytest --verbose --disable-warnings ./test/apiv2/python
-	touch test/__init__.py
-	env CONTAINERS_CONF=$(CURDIR)/test/apiv2/containers.conf PODMAN=./bin/podman \
-		pytest --verbose --disable-warnings ./test/python/docker
-	rm -f test/__init__.py
 
 # Order is important running python tests first causes the bash tests
 # to fail, see 12-imagesMore.  FIXME order of tests should not matter

contrib/cirrus/setup_environment.sh

@@ -393,7 +393,6 @@ case "$TEST_FLAVOR" in
         ;& # Continue with next item
     apiv2)
         msg "Installing previously downloaded/cached packages"
-        showrun dnf install -y $PACKAGE_DOWNLOAD_DIR/python3*.rpm
         virtualenv .venv/requests
         source .venv/requests/bin/activate
         showrun pip install --upgrade pip

test/python/requirements.txt

@@ -1,8 +0,0 @@
-docker~=6.1.0
-requests-mock~=1.12.1
-requests~=2.32.3
-setuptools~=72.1.0
-python-dateutil~=2.9.0
-PyYAML~=6.0.0
-openapi-schema-validator~=0.6.2
-pytest==8.1.2

test/python/requirements.txt

@@ -0,0 +1 @@
+../apiv2/python/requirements.txt