From 238e299c07972df2bb257c7f51dddaf1ea9763cf Mon Sep 17 00:00:00 2001
From: Meni Yakove <441263+myakove@users.noreply.github.com>
Date: Thu, 27 Jul 2023 21:32:41 +0300
Subject: [PATCH] Poetry update fix tomlkit v4.14 v4.13 (#1312)

* Update poetry to fix tomlkit issue (#1306) (#1310)

* Update poetry to fix tomlkit issue (#1306)

* Update poetry to fix tomlkit issue

* tox: use pip to install poetry

* fix poetry.lock file

* poetry add pytest

* Fix poetry lock file

* Fix poetry lock file
---
 poetry.lock    | 85 +++++++++++++++++++++++++++++++++++++++++++-------
 pyproject.toml |  4 +++
 tox.ini        | 31 +++++++++---------
 3 files changed, 94 insertions(+), 26 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index a854e62d3f..c3ed1ef50a 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -491,6 +491,20 @@ files = [
 [package.dependencies]
 packaging = ">=20.9"
 
+[[package]]
+name = "exceptiongroup"
+version = "1.1.2"
+description = "Backport of PEP 654 (exception groups)"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "exceptiongroup-1.1.2-py3-none-any.whl", hash = "sha256:e346e69d186172ca7cf029c8c1d16235aa0e04035e5750b4b95039e65204328f"},
+    {file = "exceptiongroup-1.1.2.tar.gz", hash = "sha256:12c3e887d6485d16943a309616de20ae5582633e0a2eda17f4e10fd61c1e8af5"},
+]
+
+[package.extras]
+test = ["pytest (>=6)"]
+
 [[package]]
 name = "executing"
 version = "1.2.0"
@@ -522,27 +536,28 @@ testing = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "diff-cover (>=7.5)", "p
 
 [[package]]
 name = "google-auth"
-version = "2.17.3"
+version = "2.22.0"
 description = "Google Authentication Library"
 optional = false
-python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*"
+python-versions = ">=3.6"
 files = [
-    {file = "google-auth-2.17.3.tar.gz", hash = "sha256:ce311e2bc58b130fddf316df57c9b3943c2a7b4f6ec31de9663a9333e4064efc"},
-    {file = "google_auth-2.17.3-py2.py3-none-any.whl", hash = "sha256:f586b274d3eb7bd932ea424b1c702a30e0393a2e2bc4ca3eae8263ffd8be229f"},
+    {file = "google-auth-2.22.0.tar.gz", hash = "sha256:164cba9af4e6e4e40c3a4f90a1a6c12ee56f14c0b4868d1ca91b32826ab334ce"},
+    {file = "google_auth-2.22.0-py2.py3-none-any.whl", hash = "sha256:d61d1b40897407b574da67da1a833bdc10d5a11642566e506565d1b1a46ba873"},
 ]
 
 [package.dependencies]
 cachetools = ">=2.0.0,<6.0"
 pyasn1-modules = ">=0.2.1"
-rsa = {version = ">=3.1.4,<5", markers = "python_version >= \"3.6\""}
+rsa = ">=3.1.4,<5"
 six = ">=1.9.0"
+urllib3 = "<2.0"
 
 [package.extras]
-aiohttp = ["aiohttp (>=3.6.2,<4.0.0dev)", "requests (>=2.20.0,<3.0.0dev)"]
+aiohttp = ["aiohttp (>=3.6.2,<4.0.0.dev0)", "requests (>=2.20.0,<3.0.0.dev0)"]
 enterprise-cert = ["cryptography (==36.0.2)", "pyopenssl (==22.0.0)"]
 pyopenssl = ["cryptography (>=38.0.3)", "pyopenssl (>=20.0.0)"]
 reauth = ["pyu2f (>=0.1.5)"]
-requests = ["requests (>=2.20.0,<3.0.0dev)"]
+requests = ["requests (>=2.20.0,<3.0.0.dev0)"]
 
 [[package]]
 name = "html5lib"
@@ -613,6 +628,17 @@ zipp = {version = ">=3.1.0", markers = "python_version < \"3.10\""}
 docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"]
 testing = ["pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-ruff"]
 
+[[package]]
+name = "iniconfig"
+version = "2.0.0"
+description = "brain-dead simple config-ini parsing"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"},
+    {file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"},
+]
+
 [[package]]
 name = "installer"
 version = "0.7.0"
@@ -1126,6 +1152,21 @@ files = [
 docs = ["furo (>=2023.5.20)", "proselint (>=0.13)", "sphinx (>=7.0.1)", "sphinx-autodoc-typehints (>=1.23,!=1.23.4)"]
 test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.3.1)", "pytest-cov (>=4.1)", "pytest-mock (>=3.10)"]
 
+[[package]]
+name = "pluggy"
+version = "1.2.0"
+description = "plugin and hook calling mechanisms for python"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "pluggy-1.2.0-py3-none-any.whl", hash = "sha256:c2fd55a7d7a3863cba1a013e4e2414658b1d07b6bc57b3919e0c63c9abb99849"},
+    {file = "pluggy-1.2.0.tar.gz", hash = "sha256:d12f0c4b579b15f5e054301bb226ee85eeeba08ffec228092f8defbaa3a4c4b3"},
+]
+
+[package.extras]
+dev = ["pre-commit", "tox"]
+testing = ["pytest", "pytest-benchmark"]
+
 [[package]]
 name = "poetry"
 version = "1.5.1"
@@ -1316,6 +1357,28 @@ files = [
 [package.dependencies]
 tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""}
 
+[[package]]
+name = "pytest"
+version = "7.4.0"
+description = "pytest: simple powerful testing with Python"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "pytest-7.4.0-py3-none-any.whl", hash = "sha256:78bf16451a2eb8c7a2ea98e32dc119fd2aa758f1d5d66dbf0a59d69a3969df32"},
+    {file = "pytest-7.4.0.tar.gz", hash = "sha256:b4bf8c45bd59934ed84001ad51e11b4ee40d40a1229d2c79f9c592b0a3f6bd8a"},
+]
+
+[package.dependencies]
+colorama = {version = "*", markers = "sys_platform == \"win32\""}
+exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""}
+iniconfig = "*"
+packaging = "*"
+pluggy = ">=0.12,<2.0"
+tomli = {version = ">=1.0.0", markers = "python_version < \"3.11\""}
+
+[package.extras]
+testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"]
+
 [[package]]
 name = "python-benedict"
 version = "0.32.0"
@@ -1842,13 +1905,13 @@ files = [
 
 [[package]]
 name = "tomlkit"
-version = "0.11.8"
+version = "0.12.1"
 description = "Style preserving TOML library"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "tomlkit-0.11.8-py3-none-any.whl", hash = "sha256:8c726c4c202bdb148667835f68d68780b9a003a9ec34167b6c673b38eff2a171"},
-    {file = "tomlkit-0.11.8.tar.gz", hash = "sha256:9330fc7faa1db67b541b28e62018c17d20be733177d290a13b24c62d1614e0c3"},
+    {file = "tomlkit-0.12.1-py3-none-any.whl", hash = "sha256:712cbd236609acc6a3e2e97253dfc52d4c2082982a88f61b640ecf0817eab899"},
+    {file = "tomlkit-0.12.1.tar.gz", hash = "sha256:38e1ff8edb991273ec9f6181244a6a391ac30e9f5098e7535640ea6be97a7c86"},
 ]
 
 [[package]]
@@ -2075,4 +2138,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.8"
-content-hash = "295eb7a1327ce130f120706df284b17d600c5f14a26246eee5e7fbc591686788"
+content-hash = "9fd88920b39c117ec42b1c05b2027f6548d873dc15ceacb904cef09e5d061a10"
diff --git a/pyproject.toml b/pyproject.toml
index 52f684f0e3..994349e9b9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -39,6 +39,10 @@ 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"
+
 [tool.poetry-dynamic-versioning.substitution]
 files = ["VERSION"]
 
diff --git a/tox.ini b/tox.ini
index 1ac220b023..e31a49f6f5 100644
--- 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,22 +16,23 @@ setenv =
     PYTHONPATH = {toxinidir}
 passenv =
     KUBECONFIG
-deps =
-    pytest
 commands =
-    pip install .
-    pip install jinja2 PyYaml
-    pytest -o log_cli=true tests/test_resources.py -k 'not kubevirt'
+    pip install poetry
+    poetry install
+    poetry run pytest -o log_cli=true tests/test_resources.py -k 'not kubevirt'
+allowlist_externals =
+   poetry
 
 [testenv:unittests]
 basepython = python3
 setenv =
     PYTHONPATH = {toxinidir}
-deps =
-    pytest
 commands =
-    pip install .
-    pytest tests/unittests
+    pip install poetry
+    poetry install
+    poetry run pytest -o log_cli=true tests/unittests
+allowlist_externals =
+   poetry
 
 [testenv:validate-resources]
 basepython = python3
@@ -39,9 +40,9 @@ setenv =
     PYTHONPATH = {toxinidir}
 passenv =
     KUBECONFIG
-deps =
-    pytest
-    requests
 commands =
-    pip install .
-    pytest tests/test_validate_resources.py
+    pip install poetry
+    poetry install
+    poetry run pytest tests/test_validate_resources.py
+allowlist_externals =
+   poetry