Skip to content

Commit

Permalink
setup: remove rpy2 from dependencie (#161)
Browse files Browse the repository at this point in the history
  • Loading branch information
paulmueller committed May 17, 2024
1 parent cf40b3d commit 2bfdef6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- enh: add section:key tool tips for analysis view metadata
- enh: added links to docs explaining default export selection
- docs: remove Shape-Out 1 reference
- setup: remove rpy2 from dependencies until #161 is fixed
- setup: migrate from setup.py to pyproject.toml
- setup: bump dclab to 0.58.7 (performance)
2.16.1
Expand Down
7 changes: 5 additions & 2 deletions docs/sec_qg_lme4.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,11 @@ with Shape-Out 1.

.. warning::
Unfortunately, LMM analysis currently does not work with the .app or
.pkg bundle on macOS. This problem is tracked in `issue #73
<https://github.com/ZELLMECHANIK-DRESDEN/ShapeOut2/issues/73>`_.
.pkg bundle on macOS or the Windows installer. This problem is tracked in
`issue #73
<https://github.com/ZELLMECHANIK-DRESDEN/ShapeOut2/issues/73>`_ and
`issue #161
<https://github.com/ZELLMECHANIK-DRESDEN/ShapeOut2/issues/161>`_.
If you are using macOS and you would like to use LMM analysis, you have to
install Shape-Out 2 as a Python package (see :ref:`sec_installation`).

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ classifiers = [
license = {text = "GPL v3"}
dependencies = [
"fcswrite>=0.5.1",
"dclab[dcor,http,lme4]>=0.58.7",
"dclab[dcor,http]>=0.58.7",
"h5py>=2.8.0",
"numpy>=1.21", # CVE-2021-33430
"pyqt5",
Expand Down

0 comments on commit 2bfdef6

Please sign in to comment.