Skip to content

Commit

Permalink
build: disable R/lme4 on macOS builds because, tracked in #73
Browse files Browse the repository at this point in the history
  • Loading branch information
paulmueller committed Feb 15, 2021
1 parent e60d47e commit 50851ba
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 7 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,7 @@ 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 rpy2
bash ./macos_build_app.sh ShapeOut2 $(python -m shapeout2 --version)
3 changes: 3 additions & 0 deletions .github/workflows/deploy_github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ jobs:
# install our patched version of pyqtgraph
pip install git+git://github.com/ZELLMECHANIK-DRESDEN/pyqtgraph.git
pip install -e .
# Uninstall rpy2, because it does not work on frozen macOS:
# https://github.com/ZELLMECHANIK-DRESDEN/ShapeOut2/issues/73
pip uninstall rpy2
- name: Build app
working-directory: ./build-recipes
run: |
Expand Down
19 changes: 19 additions & 0 deletions build-recipes/hook-rpy2.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# ------------------------------------------------------------------
# Copyright (c) 2021 PyInstaller Development Team.
#
# This file is distributed under the terms of the GNU General Public
# License (version 2.0 or later).
#
# The full license is available in LICENSE.GPL.txt, distributed with
# this software.
#
# SPDX-License-Identifier: GPL-2.0-or-later
# ------------------------------------------------------------------


hiddenimports = [
"rpy2",
"rpy2.robjects",
"rpy2.robjects.packages",
"rpy2.situation",
]
6 changes: 0 additions & 6 deletions build-recipes/hook-shapeout2.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,3 @@
# Data files
datas = collect_data_files("shapeout2", include_py_files=True)
datas += collect_data_files("shapeout2", subdir="img")

hiddenimports = ["rpy2",
"rpy2.robjects",
"rpy2.robjects.packages",
"rpy2.situation",
]
1 change: 0 additions & 1 deletion build-recipes/macos_build_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Any additional requirements for building the application
pyinstaller>=4.2
rpy2
# pyinstaller is missing a hook for the latest release of scipy
scipy<1.5.0

0 comments on commit 50851ba

Please sign in to comment.