Merge pull request #166 from bradmwilliams/deprecate-python2

Deprecating Python2 support

Author: openshift-merge-bot[bot]

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
 

images/monitoring.Dockerfile

@@ -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",

pyproject.toml

@@ -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