Skip to content

Deprecating Python2 support #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 17, 2024
Merged

Deprecating Python2 support #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions images/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
13 changes: 0 additions & 13 deletions images/monitoring.Dockerfile
View file
Open in desktop

This file was deleted.

7 changes: 3 additions & 4 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
9 changes: 0 additions & 9 deletions run_unittests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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