Move upgrade of pip/setuptools from redhat workflow to redhat docker …

…file, and remove installation of build requirements from workflows (#2857) * Add upgrade of pip/setuptools to redhat docker file * Remove upgrade of pip/setuptools from redhat workflow * Remove installation of build requirements
FEniCS · Nov 4, 2023 · 60661a4 · 60661a4
1 parent a981c5c
commit 60661a4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
@@ -145,7 +145,6 @@ jobs:
 
       - name: Build Python interface
         run: |
-          python3 -m pip install -r python/build-requirements.txt # TO REMOVE
           python3 -m pip -v install --check-build-dependencies --no-build-isolation --config-settings=cmake.build-type="Debug" python/
       - name: Build Python interface documentation
         run: |

diff --git a/.github/workflows/oneapi.yml b/.github/workflows/oneapi.yml
@@ -87,7 +87,6 @@ jobs:
       - name: Build DOLFINx Python interface
         run: |
           . /opt/intel/oneapi/setvars.sh
-          pip install -r python/build-requirements.txt # TO REMOVE
           pip -v install --check-build-dependencies --no-build-isolation python/
       - name: Set default DOLFINx JIT options
         run: |

diff --git a/.github/workflows/redhat.yml b/.github/workflows/redhat.yml
@@ -24,10 +24,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Upgrade pip and setuptools
-        run: |
-          python3 -m pip install --upgrade pip setuptools wheel
-
       - name: Install FEniCS Python components
         run: |
           python3 -m pip install git+https://github.com/FEniCS/ufl.git
@@ -64,7 +60,6 @@ jobs:
 
       - name: Build Python interface (editable install)
         run: |
-          python3 -m pip install -r python/build-requirements.txt # TO REMOVE
           python3 -m pip -v install --check-build-dependencies --no-build-isolation --config-settings=cmake.build-type=Debug --config-settings=build-dir="build" -e python/
 
       - name: Set default DOLFINx JIT options

diff --git a/docker/Dockerfile.redhat b/docker/Dockerfile.redhat
@@ -61,9 +61,12 @@ RUN curl -L -O https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${HDF5_SERIES
     make -j${BUILD_NP} install && \
     rm -rf /tmp/*
 
-# First set of dependencies for building and running Python DOLFINx
-# Second set of dependencies for running DOLFINx tests
-RUN python3 -m pip install --no-cache-dir cffi numba mpi4py nanobind scikit-build-core[pyproject] wheel && \
+# Install Python packages (via pip)
+# - make sure pip/setuptoools are up-to-date before using them
+# - First set of dependencies for building and running Python DOLFINx
+# - Second set of dependencies for running DOLFINx tests
+RUN python3 -m pip install --no-cache-dir --upgrade pip setuptools && \
+    python3 -m pip install --no-cache-dir cffi numba mpi4py nanobind scikit-build-core[pyproject] wheel && \
     python3 -m pip install --no-cache-dir cppimport pytest pytest-xdist scipy matplotlib
 
 # Build PETSc