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.
AcademySoftwareFoundation · Oct 2, 2024 · a3e9ccb · a3e9ccb
1 parent 93b7652
commit a3e9ccb
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 23 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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',