From 953e707523fa94bbd0fc2ea9e63c61794779eb2a Mon Sep 17 00:00:00 2001
From: Brad Williams <bradmwilliams@gmail.com>
Date: Sat, 15 Jun 2024 09:28:11 -0400
Subject: [PATCH] Deprecating Python2 support

---
 images/Dockerfile            |  4 ++--
 images/monitoring.Dockerfile | 13 -------------
 pyproject.toml               |  7 +++----
 run_unittests.sh             |  9 ---------
 4 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100644 images/monitoring.Dockerfile

diff --git a/images/Dockerfile b/images/Dockerfile
index e84c701..3213e29 100644
--- a/images/Dockerfile
+++ b/images/Dockerfile
@@ -1,13 +1,13 @@
 FROM registry.ci.openshift.org/origin/4.16:cli as cli
 
-FROM registry.ci.openshift.org/origin/centos:stream8
+FROM centos:stream9
 LABEL maintainer="brawilli@redhat.com"
 
 COPY --from=cli /usr/bin/oc /usr/bin/
 
 ADD . /openshift-client-python
 
-RUN yum install -y python2 python3 git diffutils && python2 -m pip install --upgrade pip && python2 -m pip install -r /openshift-client-python/requirements.txt && python3 -m pip install --upgrade pip && python3 -m pip install -r /openshift-client-python/requirements.txt
+RUN yum install -y python3 python3-pip git diffutils && python3 -m pip install --upgrade pip && python3 -m pip install -r /openshift-client-python/requirements.txt
 
 ENV PYTHONPATH=/openshift-client-python/packages:$PYTHONPATH PYTHONUNBUFFERED=1
 
diff --git a/images/monitoring.Dockerfile b/images/monitoring.Dockerfile
deleted file mode 100644
index 90c8ee9..0000000
--- a/images/monitoring.Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM centos:7
-
-RUN yum --enablerepo=extras install -y epel-release && \
-    yum install -y git python2 python-pip && \
-    pip install paramiko pyyaml prometheus_client boto3 slackclient && \
-    mkdir /openshift-client-python
-
-COPY packages /openshift-client-python/packages
-
-ENV PYTHONPATH=/openshift-client-python/packages
-ENV PYTHONUNBUFFERED=1
-
-ENTRYPOINT /bin/sh
diff --git a/pyproject.toml b/pyproject.toml
index bc9fb14..d275edc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -27,16 +27,15 @@ classifiers = [
     "License :: OSI Approved :: Apache Software License",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 2",
-    "Programming Language :: Python :: 2.7",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.12",
     "Topic :: Utilities",
 ]
-requires-python = ">= 2.7"
+requires-python = ">= 3.0"
 dependencies = [
-    "pyyaml",
+    "build",
     "six",
+    "pyyaml",
 ]
 dynamic = [
     "version",
diff --git a/run_unittests.sh b/run_unittests.sh
index b27249e..17d1d88 100755
--- a/run_unittests.sh
+++ b/run_unittests.sh
@@ -5,13 +5,4 @@ SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]:-$0}")
 export PYTHONPATH="${SCRIPT_ROOT}/packages"
 cd ${SCRIPT_ROOT}/packages
 
-if command -v python2 > /dev/null
-then
-  echo "python2: running unit tests"
-  python2 -m unittest discover
-else
-  echo "python2 not detected. Skipping"
-fi
-
-echo "python3: running unit tests"
 python3 -m unittest discover