ci: remove rpy2 from build pipeline (#161)

ZELLMECHANIK-DRESDEN · May 17, 2024 · 876ef72 · 876ef72
1 parent 17ea7a8
commit 876ef72
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 32 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -34,18 +34,7 @@ jobs:
     - name: install R
       uses: r-lib/actions/setup-r@v2
       with:
-        r-version: '3.6.3'
-    - name: Downgrade rpy2 (Windows)
-      if: runner.os == 'Windows'
-      run: |
-        # Force installation of rpy2 3.5.12
-        # https://github.com/rpy2/rpy2/issues/1044
-        python -m pip install rpy2==3.5.12
-    - name: install lme4 (Windows)
-      if: runner.os == 'Windows'
-      shell: bash
-      run: |
-        R -e "install.packages('lme4', repos='http://cran-archive.r-project.org', type='binary')"
+        r-version: '4.1.2'
     - name: Install Python dependencies
       run: |
         # prerequisites
@@ -56,8 +45,12 @@ jobs:
         pip install -r tests/requirements.txt
         # show installed packages
         pip freeze
-        # show information for rpy2
-        python -m rpy2.situation
+    - name: Downgrade rpy2 (Windows)
+      if: runner.os == 'Windows' || runner.os == 'macOS'
+      run: |
+        # Remove rpy2 from build pipeline
+        # https://github.com/ZELLMECHANIK-DRESDEN/ShapeOut2/issues/161
+        python -m pip uninstall rpy2
     - name: Start application and print version
       env:
         # Display must be available globally for linux to know where xvfb is
@@ -79,7 +72,4 @@ jobs:
       if: runner.os == 'macOS'
       working-directory: ./build-recipes
       run: |
-        # Uninstall rpy2, because it does not work on frozen macOS:
-        # https://github.com/ZELLMECHANIK-DRESDEN/ShapeOut2/issues/73
-        pip uninstall -y rpy2
         bash ./macos_build_app.sh ShapeOut2 $(python -m shapeout2 --version)
diff --git a/.github/workflows/deploy_github.yml b/.github/workflows/deploy_github.yml
@@ -28,26 +28,15 @@ jobs:
     - name: install R
       uses: r-lib/actions/setup-r@v2
       with:
-        r-version: '3.6.3'
-    - name: Downgrade rpy2 (Windows)
-      if: runner.os == 'Windows'
-      run: |
-        # Force installation of rpy2 3.5.12
-        # https://github.com/rpy2/rpy2/issues/1044
-        python -m pip install rpy2==3.5.12
+        r-version: '4.1.2'
     - name: Install Python dependencies
       run: |
         python -m pip install --upgrade pip
         pip install setuptools wheel twine
         pip install .
-    - name: Build macOS app
-      if: runner.os == 'macOS'
-      working-directory: ./build-recipes
-      run: |
-        # Uninstall rpy2, because it does not work on frozen macOS:
-        # https://github.com/ZELLMECHANIK-DRESDEN/ShapeOut2/issues/73
-        pip uninstall -y rpy2
-        bash ./macos_build_app.sh ShapeOut2 ${{ env.RELEASE_VERSION }}
+        # remove rpy2 from build pipeline
+        # https://github.com/ZELLMECHANIK-DRESDEN/ShapeOut2/issues/161
+        pip uninstall rpy2
     - name: Build windows executable
       if: runner.os == 'windows'
       working-directory: ./build-recipes