Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add napari-base output and reorganize dependencies #63

Merged
merged 7 commits into from
Jul 16, 2024
Merged

Add napari-base output and reorganize dependencies #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5b2a201
Update meta.yaml to include napari-plugin-manager >=0.1.0a2 in run de…
psobolewskiPhD Jul 13, 2024
379bfd6
update build number
psobolewskiPhD Jul 13, 2024
3913dea
Merge branch 'main' of github.com:conda-forge/napari-feedstock into p…
jaimergp Jul 16, 2024
379119b
Add napari-base output, redistribute dependencies
jaimergp Jul 16, 2024
5501d9f
lint
jaimergp Jul 16, 2024
3504f2b
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.0, and co…
Jul 16, 2024
62c929f
update py-triangle comment
jaimergp Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .scripts/build_steps.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 17 additions & 3 deletions README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 29 additions & 12 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ source:
sha256: 3920b144d72e8af8fe0da3da679b2d39aa2d097c10a2c75a3b4e42ffcef17cac

build:
number: 1
number: 2

outputs:
- name: napari
- name: napari-base
version: {{ version }}
build:
noarch: python
Expand Down Expand Up @@ -49,7 +49,6 @@ outputs:
- magicgui >=0.7.0
- napari-console >=0.0.9
- napari-plugin-engine >=0.1.9
- napari-svg >=0.1.8
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved to napari

- npe2 >=0.7.6
- numpy >=1.22.2
- numpydoc >=0.9.2
Expand All @@ -73,19 +72,10 @@ outputs:
- vispy >=0.14.1,<0.15.0a0
- wrapt >=1.11.1

# additional dependencies for convenience in conda-forge
- fsspec
- pooch >=1.3.0
- zarr >=2.12.0

run_constrained:
Comment on lines 74 to 75
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved to napari

- napari-plugin-manager >=0.1.0a2,<0.3.0a0
Copy link
Member

@jaimergp jaimergp Jul 16, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved to napari as a full dependency

- pyside2 >=5.13.2,!=5.15.0
- pyside6 <6.5|>=6.7
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for keeping things flexible. I don't really understand the plugin manager but cool!!!

- pyqt >=5.12.3,!=5.15.0,<6.0a0|>=6.5,!=6.6.1
# Nice for performance, but optional. Inclusion under discussion.
# - py-triangle
# - numba >=0.57.1 # https://github.com/napari/napari/pull/6467#issuecomment-1819038165
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved to napari as full dependency.


test:
requires:
Expand Down Expand Up @@ -115,6 +105,33 @@ outputs:
- LICENSE
- napari/_vendor/darkdetect/LICENSE
- napari/_vendor/qt_json_builder/LICENSE
summary: a fast n-dimensional image viewer in Python, with only the required dependencies
doc_url: http://napari.org
dev_url: https://github.com/napari/napari

- name: napari
version: {{ version }}
build:
noarch: python
requirements:
run:
- {{ pin_subpackage('napari-base', exact=True) }}
- fsspec
- napari-plugin-manager >=0.1.0a2,<0.3.0a0
- napari-svg >=0.1.8
- numba >=0.57.1
- pooch >=1.3.0
# - py-triangle # can segfault with bad data: https://github.com/napari/napari/pull/6654
- zarr >=2.12.0
test: # just to check that the environment can indeed solve
requires:
- pyside2 # use this opportunity to test solvability with other backend
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this mean we are testing with pyside2 but not with pyside6 or pyqt or...?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We tested installability with pyqt in the output above (napari-base). In here we just pick pyside2 because we can now, given the new output. We are not running the test suite here, just installability checks and minimum "this thing runs", import wise.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, thanks!

imports:
- napari
about:
home: http://napari.org
license: BSD-3-Clause AND MIT
license_file: LICENSE
summary: a fast n-dimensional image viewer in Python
description: a fast n-dimensional image viewer in Python
doc_url: http://napari.org
Expand Down