From a3e9ccb7259313cfb5d5f3a0070b4d72f2a9542b Mon Sep 17 00:00:00 2001 From: Diego Tavares Date: Wed, 2 Oct 2024 09:16:27 -0700 Subject: [PATCH] Fix Packaging pipeline (#1526) Upgrades on setuptools and pip ended up breaking our packaging pipeline. Changes on the packaging docker files and requirements.txt were required to fix the build. --- cueadmin/Dockerfile | 6 +++--- cueadmin/setup.py | 2 -- cuegui/Dockerfile | 2 +- cuegui/setup.py | 2 -- cuesubmit/Dockerfile | 2 +- cuesubmit/setup.py | 2 -- pycue/Dockerfile | 5 +++-- pycue/setup.py | 2 -- pyoutline/Dockerfile | 6 +++--- pyoutline/setup.py | 2 -- requirements.txt | 2 +- rqd/setup.py | 2 -- 12 files changed, 12 insertions(+), 23 deletions(-) diff --git a/cueadmin/Dockerfile b/cueadmin/Dockerfile index 74b318d46..be4ad1ab2 100644 --- a/cueadmin/Dockerfile +++ b/cueadmin/Dockerfile @@ -32,10 +32,10 @@ COPY cueadmin/tests/ ./cueadmin/tests COPY cueadmin/cueadmin ./cueadmin/cueadmin COPY VERSION.in VERSIO[N] ./ -RUN test -e VERSION || echo "$(cat VERSION.in)-custom" | tee VERSION +RUN test -e VERSION || echo "$(cat VERSION.in)" | tee VERSION -RUN cd pycue && python3 setup.py install -RUN cd cueadmin && python3 setup.py test +RUN cd pycue && python3 -m pip install . +RUN cd pycue && python3 -m unittest tests/*.py RUN cp LICENSE requirements.txt VERSION cueadmin/ diff --git a/cueadmin/setup.py b/cueadmin/setup.py index 3b829a089..cceac811d 100644 --- a/cueadmin/setup.py +++ b/cueadmin/setup.py @@ -41,8 +41,6 @@ classifiers=[ 'License :: OSI Approved :: Apache Software License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', diff --git a/cuegui/Dockerfile b/cuegui/Dockerfile index 2d83f8f41..3e6630804 100644 --- a/cuegui/Dockerfile +++ b/cuegui/Dockerfile @@ -62,7 +62,7 @@ COPY cuegui/tests ./cuegui/tests COPY cuegui/cuegui ./cuegui/cuegui COPY VERSION.in VERSIO[N] ./ -RUN test -e VERSION || echo "$(cat VERSION.in)-custom" | tee VERSION +RUN test -e VERSION || echo "$(cat VERSION.in)" | tee VERSION RUN cd pycue && python3.6 setup.py install diff --git a/cuegui/setup.py b/cuegui/setup.py index 1c7c6455b..6ca45dc2b 100644 --- a/cuegui/setup.py +++ b/cuegui/setup.py @@ -41,8 +41,6 @@ classifiers=[ 'License :: OSI Approved :: Apache Software License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', diff --git a/cuesubmit/Dockerfile b/cuesubmit/Dockerfile index 4f007dee8..eb2a4902a 100644 --- a/cuesubmit/Dockerfile +++ b/cuesubmit/Dockerfile @@ -56,7 +56,7 @@ COPY cuesubmit/plugins ./cuesubmit/plugins COPY cuesubmit/cuesubmit ./cuesubmit/cuesubmit COPY VERSION.in VERSIO[N] ./ -RUN test -e VERSION || echo "$(cat VERSION.in)-custom" | tee VERSION +RUN test -e VERSION || echo "$(cat VERSION.in)" | tee VERSION RUN cd pycue && python3.6 setup.py install RUN cd pyoutline && python3.6 setup.py install diff --git a/cuesubmit/setup.py b/cuesubmit/setup.py index e9b82d3b4..1bb39a057 100644 --- a/cuesubmit/setup.py +++ b/cuesubmit/setup.py @@ -41,8 +41,6 @@ classifiers=[ 'License :: OSI Approved :: Apache Software License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', diff --git a/pycue/Dockerfile b/pycue/Dockerfile index e93f9526a..1bdeef074 100644 --- a/pycue/Dockerfile +++ b/pycue/Dockerfile @@ -28,9 +28,10 @@ RUN python3 -m grpc_tools.protoc \ RUN 2to3 -wn -f import pycue/opencue/compiled_proto/*_pb2*.py COPY VERSION.in VERSIO[N] ./ -RUN test -e VERSION || echo "$(cat VERSION.in)-custom" | tee VERSION +RUN test -e VERSION || echo "$(cat VERSION.in)" | tee VERSION -RUN cd pycue && python3 setup.py test +RUN cd pycue && python3 -m pip install . +RUN cd pycue && python3 -m unittest tests/*.py RUN cp LICENSE requirements.txt VERSION pycue/ diff --git a/pycue/setup.py b/pycue/setup.py index 0750ab016..ad6e29f87 100644 --- a/pycue/setup.py +++ b/pycue/setup.py @@ -41,8 +41,6 @@ classifiers=[ 'License :: OSI Approved :: Apache Software License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', diff --git a/pyoutline/Dockerfile b/pyoutline/Dockerfile index 02f954c23..28bb89718 100644 --- a/pyoutline/Dockerfile +++ b/pyoutline/Dockerfile @@ -34,10 +34,10 @@ COPY pyoutline/wrappers ./pyoutline/wrappers COPY pyoutline/outline ./pyoutline/outline COPY VERSION.in VERSIO[N] ./ -RUN test -e VERSION || echo "$(cat VERSION.in)-custom" | tee VERSION +RUN test -e VERSION || echo "$(cat VERSION.in)" | tee VERSION -RUN cd pycue && python3 setup.py install -RUN cd pyoutline && python3 setup.py test +RUN cd pycue && python3 -m pip install . +RUN cd pycue && python3 -m unittest tests/*.py RUN cp LICENSE requirements.txt VERSION pyoutline/ diff --git a/pyoutline/setup.py b/pyoutline/setup.py index 0ecc79e0c..c9d2ed088 100644 --- a/pyoutline/setup.py +++ b/pyoutline/setup.py @@ -41,8 +41,6 @@ classifiers=[ 'License :: OSI Approved :: Apache Software License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', diff --git a/requirements.txt b/requirements.txt index e146b7d3f..4ec409819 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ grpcio-tools==1.48.2;python_version<"3.7" grpcio==1.53.2;python_version>="3.7" grpcio-tools==1.53.0;python_version>="3.7" mock==2.0.0 -packaging==20.9 +packaging==24.1 psutil==5.9.8 pyfakefs==3.6;python_version<"3.7" pyfakefs==5.2.3;python_version>="3.7" diff --git a/rqd/setup.py b/rqd/setup.py index c1f7b9cc4..a9735b142 100644 --- a/rqd/setup.py +++ b/rqd/setup.py @@ -41,8 +41,6 @@ classifiers=[ 'License :: OSI Approved :: Apache Software License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7',