Remove openshift python module dependencies, use kubernetes

RedHatQE · Jul 26, 2023 · 61fb78d · 61fb78d
1 parent 7c19259
commit 61fb78d
Show file tree

Hide file tree

Showing 4 changed files with 88 additions and 20 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -39,6 +39,11 @@ Download = "https://pypi.org/project/openshift-python-wrapper/"
 [tool.poetry.group.dev.dependencies]
 ipdb = "^0.13.13"
 
+
+[tool.poetry.group.tests.dependencies]
+pytest = "^7.4.0"
+requests = "^2.31.0"
+
 [tool.poetry-dynamic-versioning.substitution]
 files = ["VERSION"]
 

diff --git a/tests/test_resources.py b/tests/test_resources.py
@@ -1,6 +1,6 @@
 import kubernetes
 import pytest
-from openshift.dynamic import DynamicClient
+from kubernetes.dynamic import DynamicClient
 
 from ocp_resources.namespace import Namespace
 from ocp_resources.pod import Pod

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{38,39,310,311}, unittests, validate-resources
+envlist = py{38,39,310,311}, unittests, validate-resources, tests
 skipsdist = True
 
 [flake8]
@@ -16,35 +16,36 @@ setenv =
     PYTHONPATH = {toxinidir}
 passenv =
     KUBECONFIG
-deps =
-    pytest
 commands =
-    pip install pip -U
-    pip install .
-    pip install jinja2 PyYaml
-    pytest -o log_cli=true tests/test_resources.py -k 'not kubevirt'
+    sh -c 'curl -sSL https://install.python-poetry.org | python3 -'
+    poetry install
+    poetry run pytest -o log_cli=true tests/test_resources.py -k 'not kubevirt'
+allowlist_externals =
+   sh
+   poetry
 
 [testenv:unittests]
 basepython = python3
 setenv =
     PYTHONPATH = {toxinidir}
-deps =
-    pytest
 commands =
-    pip install pip -U
-    pip install .
-    pytest -o log_cli=true tests/unittests
+    sh -c 'curl -sSL https://install.python-poetry.org | python3 -'
+    poetry install
+    poetry run pytest -o log_cli=true tests/unittests
+allowlist_externals =
+   sh
+   poetry
 
 [testenv:validate-resources]
 basepython = python3
 setenv =
     PYTHONPATH = {toxinidir}
 passenv =
     KUBECONFIG
-deps =
-    pytest
-    requests
 commands =
-    pip install pip -U
-    pip install .
-    pytest tests/test_validate_resources.py
+    sh -c 'curl -sSL https://install.python-poetry.org | python3 -'
+    poetry install
+    poetry run pytest tests/test_validate_resources.py
+allowlist_externals =
+   sh
+   poetry