From: Kefu Chai <kchai@redhat.com>
Date: Sun, 31 Jan 2021 03:47:07 +0000 (+0800)
Subject: cephadm: do not install ipaddress
X-Git-Tag: v16.2.0~178^2~68
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e4bc73feb1d7101a9467bf0a56ec8b3e64206e9b;p=ceph.git

cephadm: do not install ipaddress

we dropped py2 env from tox in c8649eff0097635ad16778d2194b07d139ce806a

so no need to install ipaddress for python<3.3 anymore

this change also silences the warning like:

Ignoring ipaddress: markers 'python_version < "3.3"' don't match your
environment

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit b5f4c9ad449131a1084061c99e895640dbbeb61d)
---

diff --git a/src/cephadm/requirements.txt b/src/cephadm/requirements.txt
deleted file mode 100644
index 92716874d983..000000000000
--- a/src/cephadm/requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-ipaddress ; python_version < '3.3'
diff --git a/src/cephadm/tox.ini b/src/cephadm/tox.ini
index 17371260e9aa..352277c714f3 100644
--- a/src/cephadm/tox.ini
+++ b/src/cephadm/tox.ini
@@ -7,7 +7,6 @@ skip_install=true
 deps =
   pytest
   mock
-  -r{toxinidir}/requirements.txt
 commands=pytest {posargs}
 
 [testenv:mypy]