Rename dev-python/{docker-py → docker}

Signed-off-by: Michał Górny <mgorny@gentoo.org>

19 files changed, 16 insertions, 15 deletions

diff --git a/app-containers/docker-compose/docker-compose-1.29.2-r1.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r1.ebuild
index abfe81c77e75..7d8e5af2aa6a 100644
--- a/app-containers/docker-compose/docker-compose-1.29.2-r1.ebuild
+++ b/app-containers/docker-compose/docker-compose-1.29.2-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 arm64"
 
 RDEPEND="
 	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-5[${PYTHON_USEDEP}]
+	>=dev-python/docker-5[${PYTHON_USEDEP}]
 	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
 	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
 	>=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
diff --git a/app-containers/docker-compose/docker-compose-1.29.2-r2.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r2.ebuild
index 75f311ad8e61..bcff35cfe706 100644
--- a/app-containers/docker-compose/docker-compose-1.29.2-r2.ebuild
+++ b/app-containers/docker-compose/docker-compose-1.29.2-r2.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
 	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-5[${PYTHON_USEDEP}]
+	>=dev-python/docker-5[${PYTHON_USEDEP}]
 	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
 	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
 	>=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
diff --git a/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild
index 4f274a47deae..39eb140045cd 100644
--- a/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild
+++ b/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 arm64"
 
 RDEPEND="
 	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-5[${PYTHON_USEDEP}]
+	>=dev-python/docker-5[${PYTHON_USEDEP}]
 	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
 	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
 	>=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
diff --git a/app-containers/sen/sen-0.6.1_p20200905-r1.ebuild b/app-containers/sen/sen-0.6.1_p20200905-r1.ebuild
index 5e5c4d1cb142..9f7bf271cf92 100644
--- a/app-containers/sen/sen-0.6.1_p20200905-r1.ebuild
+++ b/app-containers/sen/sen-0.6.1_p20200905-r1.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~amd64"
 RDEPEND="
 	dev-python/urwid[${PYTHON_USEDEP}]
 	dev-python/urwidtrees[${PYTHON_USEDEP}]
-	dev-python/docker-py[${PYTHON_USEDEP}]
+	dev-python/docker[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker/Manifest
index d73f2ade9692..d73f2ade9692 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker/Manifest
diff --git a/dev-python/docker-py/docker-py-6.1.2.ebuild b/dev-python/docker/docker-6.1.2.ebuild
index 2e969b8180d1..2e969b8180d1 100644
--- a/dev-python/docker-py/docker-py-6.1.2.ebuild
+++ b/dev-python/docker/docker-6.1.2.ebuild
diff --git a/dev-python/docker-py/metadata.xml b/dev-python/docker/metadata.xml
index f7c364e174f0..f7c364e174f0 100644
--- a/dev-python/docker-py/metadata.xml
+++ b/dev-python/docker/metadata.xml
diff --git a/dev-python/dockerpty/dockerpty-0.4.1-r2.ebuild b/dev-python/dockerpty/dockerpty-0.4.1-r2.ebuild
index 8a1137c92af3..9b58cc5366ca 100644
--- a/dev-python/dockerpty/dockerpty-0.4.1-r2.ebuild
+++ b/dev-python/dockerpty/dockerpty-0.4.1-r2.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="amd64 arm64"
 
 BDEPEND="
 	test? (
-		>=dev-python/docker-py-0.7.0_rc2[${PYTHON_USEDEP}]
+		>=dev-python/docker-0.7.0_rc2[${PYTHON_USEDEP}]
 		>=dev-python/expects-0.4[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/moto/moto-4.1.10.ebuild b/dev-python/moto/moto-4.1.10.ebuild
index 517b7e9209de..3d3bfbf9a17f 100644
--- a/dev-python/moto/moto-4.1.10.ebuild
+++ b/dev-python/moto/moto-4.1.10.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/cfn-lint-0.40.0[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
 	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/docker-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
 	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-4.1.6.ebuild b/dev-python/moto/moto-4.1.6.ebuild
index 6f3d79b72a93..038718c9425c 100644
--- a/dev-python/moto/moto-4.1.6.ebuild
+++ b/dev-python/moto/moto-4.1.6.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/cfn-lint-0.40.0[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
 	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/docker-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
 	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-4.1.7.ebuild b/dev-python/moto/moto-4.1.7.ebuild
index 61aa80aa5c57..838da80659a1 100644
--- a/dev-python/moto/moto-4.1.7.ebuild
+++ b/dev-python/moto/moto-4.1.7.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/cfn-lint-0.40.0[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
 	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/docker-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
 	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-4.1.8.ebuild b/dev-python/moto/moto-4.1.8.ebuild
index bb262787b7eb..44661a6d0c3e 100644
--- a/dev-python/moto/moto-4.1.8.ebuild
+++ b/dev-python/moto/moto-4.1.8.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/cfn-lint-0.40.0[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
 	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/docker-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
 	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-4.1.9.ebuild b/dev-python/moto/moto-4.1.9.ebuild
index 15848ecb97f6..3c53f9a36193 100644
--- a/dev-python/moto/moto-4.1.9.ebuild
+++ b/dev-python/moto/moto-4.1.9.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/cfn-lint-0.40.0[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
 	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/docker-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
 	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc23.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc23.ebuild
index 23dfb52c250c..bc0fa7676d1d 100644
--- a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc23.ebuild
+++ b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc23.ebuild
@@ -20,7 +20,7 @@ IUSE="test"
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
 	dev-python/pytest-tempdir[${PYTHON_USEDEP}]
-	dev-python/docker-py[${PYTHON_USEDEP}]
+	dev-python/docker[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]
 	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
 	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot/buildbot-3.6.1.ebuild b/dev-util/buildbot/buildbot-3.6.1.ebuild
index 783139307996..866193742b47 100644
--- a/dev-util/buildbot/buildbot-3.6.1.ebuild
+++ b/dev-util/buildbot/buildbot-3.6.1.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 		dev-python/txrequests[${PYTHON_USEDEP}]
 	)
 	docker? (
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/docker-2.2.0[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index 1a42f1fca759..05958fa7d93f 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 		dev-python/txrequests[${PYTHON_USEDEP}]
 	)
 	docker? (
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/docker-2.2.0[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 	)
 "
diff --git a/profiles/features/wd40/package.use.mask b/profiles/features/wd40/package.use.mask
index 59fffef97364..ba29aa68bb37 100644
--- a/profiles/features/wd40/package.use.mask
+++ b/profiles/features/wd40/package.use.mask
@@ -65,7 +65,7 @@ net-vpn/networkmanager-vpnc gtk
 app-admin/salt keyring neutron
 dev-python/boto test
 dev-python/dask test
-dev-python/docker-py test
+dev-python/docker test
 dev-python/google-api-python-client test
 dev-python/httpx-socks test
 dev-python/hypercorn test
diff --git a/profiles/updates/2Q-2023 b/profiles/updates/2Q-2023
index acfcf31b8b3d..5c67f062d285 100644
--- a/profiles/updates/2Q-2023
+++ b/profiles/updates/2Q-2023
@@ -23,3 +23,4 @@ move app-misc/pdfpc app-text/pdfpc
 move dev-python/python-email-validator dev-python/email-validator
 move dev-python/semantic_version dev-python/semantic-version
 move dev-python/prometheus_client dev-python/prometheus-client
+move dev-python/docker-py dev-python/docker
diff --git a/sys-process/glances/glances-3.3.0-r1.ebuild b/sys-process/glances/glances-3.3.0-r1.ebuild
index 23b3ce9c9377..84279372149c 100644
--- a/sys-process/glances/glances-3.3.0-r1.ebuild
+++ b/sys-process/glances/glances-3.3.0-r1.ebuild
@@ -65,7 +65,7 @@ pkg_postinst() {
 	#optfeature "Action script feature" dev-python/pystache
 	optfeature "Autodiscover mode" dev-python/zeroconf
 	optfeature "Cloud support" dev-python/requests
-	optfeature "Docker monitoring support" dev-python/docker-py
+	optfeature "Docker monitoring support" dev-python/docker
 	#optfeature "Export module" \
 	#	unpackaged/bernhard \
 	#	unpackaged/cassandra-driver \