From 4822b5fa47098717d64dc2d8d2bd4325c5566209 Mon Sep 17 00:00:00 2001 From: Diego Tavares Date: Fri, 13 Dec 2024 11:23:40 -0800 Subject: [PATCH 1/2] Limit dependency for pip package NodeGraphQtPy --- requirements_gui.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_gui.txt b/requirements_gui.txt index b93a77357..a03972ac7 100644 --- a/requirements_gui.txt +++ b/requirements_gui.txt @@ -3,4 +3,4 @@ PySide6==6.5.3;python_version=="3.11" PySide2==5.15.2.1;python_version<="3.10" QtPy==1.11.3;python_version<"3.7" QtPy==2.4.1;python_version>="3.7" -NodeGraphQtPy==0.6.38.6 +NodeGraphQtPy==0.6.38.6;python_version>="3.7" From 2b00f5cc402fbea6348effed8c4022f4c0afe060 Mon Sep 17 00:00:00 2001 From: Diego Tavares Date: Fri, 13 Dec 2024 12:21:58 -0800 Subject: [PATCH 2/2] Upgrade cicd for cuegui and cuesubmit to rocky9 --- cuegui/Dockerfile | 34 ++++++++++------------------------ cuesubmit/Dockerfile | 27 ++++++++++----------------- requirements_gui.txt | 2 +- 3 files changed, 21 insertions(+), 42 deletions(-) diff --git a/cuegui/Dockerfile b/cuegui/Dockerfile index dc6ee028a..8d3e932e4 100644 --- a/cuegui/Dockerfile +++ b/cuegui/Dockerfile @@ -1,12 +1,7 @@ -FROM --platform=linux/x86_64 centos:7 +FROM --platform=linux/x86_64 rockylinux:9.3 WORKDIR /src -# centos:7 repos moved to vault.centos -RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/CentOS-*.repo -RUN sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/CentOS-*.repo -RUN sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/CentOS-*.repo - RUN yum -y install \ epel-release \ fontconfig \ @@ -25,20 +20,13 @@ RUN yum -y install \ xcb-util-wm.x86_64 RUN yum -y install \ - python36 \ - python36-devel \ - python36-pip - -RUN python3.6 -m pip install --upgrade pip -RUN python3.6 -m pip install --upgrade setuptools - -RUN dbus-uuidgen > /etc/machine-id + python\ + python-pip -COPY LICENSE ./ -COPY requirements.txt ./ -COPY requirements_gui.txt ./ +RUN python -m pip install --upgrade pip -RUN python3.6 -m pip install -r requirements.txt -r requirements_gui.txt +COPY LICENSE requirements.txt requirements_gui.txt ./ +RUN python -m pip install -r requirements.txt -r requirements_gui.txt COPY proto/ ./proto COPY pycue/README.md ./pycue/ @@ -47,7 +35,7 @@ COPY pycue/FileSequence ./pycue/FileSequence COPY pycue/opencue ./pycue/opencue COPY ci/fix_compiled_proto.py . -RUN python3.6 -m grpc_tools.protoc \ +RUN python -m grpc_tools.protoc \ -I=./proto \ --python_out=./pycue/opencue/compiled_proto \ --grpc_python_out=./pycue/opencue/compiled_proto \ @@ -55,7 +43,7 @@ RUN python3.6 -m grpc_tools.protoc \ # Fix imports to work in both Python 2 and 3. See # for more info. -RUN python3 ./fix_compiled_proto.py pycue/opencue/compiled_proto +RUN python ./fix_compiled_proto.py pycue/opencue/compiled_proto COPY cuegui/README.md ./cuegui/ COPY cuegui/setup.py ./cuegui/ @@ -65,10 +53,8 @@ COPY cuegui/cuegui ./cuegui/cuegui COPY VERSION.in VERSIO[N] ./ RUN test -e VERSION || echo "$(cat VERSION.in)" | tee VERSION -RUN cd pycue && python3.6 setup.py install - -RUN cd cuegui && xvfb-run -d python3.6 setup.py test - +RUN cd pycue && python setup.py install +RUN cd cuegui && xvfb-run -d python setup.py test RUN cp LICENSE requirements.txt requirements_gui.txt VERSION cuegui/ RUN versioned_name="cuegui-$(cat ./VERSION)-all" \ diff --git a/cuesubmit/Dockerfile b/cuesubmit/Dockerfile index abc14e540..d4f41691d 100644 --- a/cuesubmit/Dockerfile +++ b/cuesubmit/Dockerfile @@ -1,12 +1,7 @@ -FROM --platform=linux/x86_64 centos:7 +FROM --platform=linux/x86_64 rockylinux:9.3 WORKDIR /src -# centos:7 repos moved to vault.centos -RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/CentOS-*.repo -RUN sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/CentOS-*.repo -RUN sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/CentOS-*.repo - RUN yum -y install \ epel-release \ gcc \ @@ -14,18 +9,16 @@ RUN yum -y install \ python-devel RUN yum -y install \ - python36 \ - python36-devel \ - python36-pip + python \ + python-pip -RUN python3.6 -m pip install --upgrade pip -RUN python3.6 -m pip install --upgrade setuptools +RUN python -m pip install --upgrade pip COPY LICENSE ./ COPY requirements.txt ./ COPY requirements_gui.txt ./ -RUN python3.6 -m pip install -r requirements.txt -r requirements_gui.txt +RUN python -m pip install -r requirements.txt -r requirements_gui.txt COPY proto/ ./proto COPY pycue/README.md ./pycue/ @@ -34,7 +27,7 @@ COPY pycue/opencue ./pycue/opencue COPY pycue/FileSequence ./pycue/FileSequence COPY ci/fix_compiled_proto.py . -RUN python3.6 -m grpc_tools.protoc \ +RUN python -m grpc_tools.protoc \ -I=./proto \ --python_out=./pycue/opencue/compiled_proto \ --grpc_python_out=./pycue/opencue/compiled_proto \ @@ -42,7 +35,7 @@ RUN python3.6 -m grpc_tools.protoc \ # Fix imports to work in both Python 2 and 3. See # for more info. -RUN python3 ./fix_compiled_proto.py pycue/opencue/compiled_proto +RUN python ./fix_compiled_proto.py pycue/opencue/compiled_proto COPY pyoutline/README.md ./pyoutline/ COPY pyoutline/setup.py ./pyoutline/ @@ -59,9 +52,9 @@ COPY cuesubmit/cuesubmit ./cuesubmit/cuesubmit COPY VERSION.in VERSIO[N] ./ 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 -RUN cd cuesubmit && python3.6 setup.py test +RUN cd pycue && python setup.py install +RUN cd pyoutline && python setup.py install +RUN cd cuesubmit && python setup.py test RUN cp LICENSE requirements.txt requirements_gui.txt VERSION cuesubmit/ diff --git a/requirements_gui.txt b/requirements_gui.txt index a03972ac7..b93a77357 100644 --- a/requirements_gui.txt +++ b/requirements_gui.txt @@ -3,4 +3,4 @@ PySide6==6.5.3;python_version=="3.11" PySide2==5.15.2.1;python_version<="3.10" QtPy==1.11.3;python_version<"3.7" QtPy==2.4.1;python_version>="3.7" -NodeGraphQtPy==0.6.38.6;python_version>="3.7" +NodeGraphQtPy==0.6.38.6