Skip to content

Commit

Permalink
Merge pull request #98 from BioimageAnalysisCoreWEHI/fix_dependency
Browse files Browse the repository at this point in the history
Dependency changes
- Added back napari-aicsimageio>0.7
- pinned numpy>2
- Added 'napari[all]' to avoid separate pyqt5 installation
- removed Python 3.11 support temporarily, until we remove napari-aicsimageio dependency
  • Loading branch information
pr4deepr authored Jan 31, 2025
2 parents 44e6a06 + a211b8a commit d6dace4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11"]
python-version: ["3.8", "3.9", "3.10"]
env:
DISPLAY: ":99.0"
steps:
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: "3.11"
python-version: "3.10"
- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools wheel
Expand Down
3 changes: 1 addition & 2 deletions core/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,9 @@ dependencies = [
"dask[distributed]",
"fsspec>=2022.8.2",
"importlib_resources",
# Older tifffile are not compatible with aicsimageio, see: https://github.com/AllenCellModeling/aicsimageio/issues/518
"napari-workflows>=0.2.8",
"npy2bdv",
"numpy",
"numpy<2",
"pandas",
"pyclesperanto_prototype>=0.20.0",
"pyopencl",
Expand Down
12 changes: 4 additions & 8 deletions plugin/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,14 @@ dependencies = [
"importlib_resources",
"lls_core",
# The lower bound is because we need this Python 3.8 fix: https://github.com/hanjinliu/magic-class/pull/108
# The upper bound is because we are waiting on https://github.com/hanjinliu/magic-class/issues/128
"magic-class>=0.7.5,<0.8.0",
"magic-class>=0.7.5",
"magicgui<0.8.0",
# Currently commented out to avoid installation issues, although
# This can be reinstated once https://github.com/pypa/pip/pull/12095 is merged
# "napari-aicsimageio>=0.7.2",
"napari-spreadsheet",
"napari-aicsimageio>=0.7.2",
"napari-workflow-inspector",
"napari-workflows>=0.2.8",
"napari>=0.4.11",
"napari[all]>=0.4.11",
"npy2bdv",
"numpy",
"numpy<2",
"psutil",
"pyclesperanto_prototype>=0.20.0",
"pydantic",
Expand Down

0 comments on commit d6dace4

Please sign in to comment.