Skip to content

Commit

Permalink
build: remove rpy2 from build pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
paulmueller committed May 17, 2024
1 parent 2bfdef6 commit d773778
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 31 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,6 @@ jobs:
pip install -r tests/requirements.txt
# show installed packages
pip freeze
- 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 -y rpy2
- name: Start application and print version
env:
# Display must be available globally for linux to know where xvfb is
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/deploy_github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ jobs:
python -m pip install --upgrade pip
pip install setuptools wheel twine
pip install .
# remove rpy2 from build pipeline
# https://github.com/ZELLMECHANIK-DRESDEN/ShapeOut2/issues/161
pip uninstall -y rpy2
- name: Build windows executable
if: runner.os == 'windows'
working-directory: ./build-recipes
Expand Down
19 changes: 0 additions & 19 deletions build-recipes/hook-rpy2.py

This file was deleted.

2 changes: 1 addition & 1 deletion build-recipes/hook-shapeout2.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
# Add the Zstandard library used by dclab
datas += collect_data_files("hdf5plugin", includes=["plugins/libh5zstd.*"])

hiddenimports = ["rpy2"]
hiddenimports = []
2 changes: 0 additions & 2 deletions build-recipes/win_build_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# Any additional requirements for building the application
# https://github.com/rpy2/rpy2/issues/796
pyinstaller
rpy2==3.4.5
scipy==1.11.4 # hat problems with pyinstaller (scipy.special._cdflib not found)

0 comments on commit d773778

Please sign in to comment.