From 0f815dc7d398dfb67297e7e570abe65ad7fbd25e Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 15 Jun 2022 15:00:19 -0400 Subject: [PATCH] Switch to python3 for all builds --- confluent_client/confluent_client.spec.tmpl | 4 ++-- confluent_server/confluent_server.spec.tmpl | 10 +--------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/confluent_client/confluent_client.spec.tmpl b/confluent_client/confluent_client.spec.tmpl index fc643ddd..3a80f7b3 100644 --- a/confluent_client/confluent_client.spec.tmpl +++ b/confluent_client/confluent_client.spec.tmpl @@ -30,7 +30,7 @@ python3 setup.py build %if "%{dist}" == ".el9" python3 setup.py build %else -python2 setup.py build +python3 setup.py build %endif %endif @@ -41,7 +41,7 @@ python3 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUI %if "%{dist}" == ".el9" python3 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-scripts=/opt/confluent/bin --install-purelib=/opt/confluent/lib/python %else -python2 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-scripts=/opt/confluent/bin --install-purelib=/opt/confluent/lib/python +python3 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-scripts=/opt/confluent/bin --install-purelib=/opt/confluent/lib/python %endif %endif diff --git a/confluent_server/confluent_server.spec.tmpl b/confluent_server/confluent_server.spec.tmpl index f442963f..30545818 100644 --- a/confluent_server/confluent_server.spec.tmpl +++ b/confluent_server/confluent_server.spec.tmpl @@ -32,15 +32,7 @@ Server for console management and systems management aggregation %setup -n %{name}-%{version} -n %{name}-%{version} %build -%if "%{dist}" == ".el8" python3 setup.py build -%else -%if "%{dist}" == ".el9" -python3 setup.py build -%else -python2 setup.py build -%endif -%endif %install %if "%{dist}" == ".el8" @@ -49,7 +41,7 @@ python3 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUI %if "%{dist}" == ".el9" python3 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES.bare --install-purelib=/opt/confluent/lib/python --install-scripts=/opt/confluent/bin %else -python2 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES.bare --install-purelib=/opt/confluent/lib/python --install-scripts=/opt/confluent/bin +python3 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES.bare --install-purelib=/opt/confluent/lib/python --install-scripts=/opt/confluent/bin %endif %endif for file in $(grep confluent/__init__.py INSTALLED_FILES.bare); do