Skip to content

Use src layout and create skimage2 directory#7864

Merged
lagru merged 45 commits intoscikit-image:mainfrom
mkcor:create-skimage2-repo
Aug 15, 2025
Merged

Use src layout and create skimage2 directory#7864
lagru merged 45 commits intoscikit-image:mainfrom
mkcor:create-skimage2-repo

Conversation

@mkcor
Copy link
Copy Markdown
Member

@mkcor mkcor commented Aug 14, 2025

Description

As per our discussion at the in-person sprint, let's go for the src layout and get started with the skimage2 namespace.

/cc @lagru @stefanv @jni @matthew-brett @Czaki

Checklist

Release note

For maintainers and optionally contributors, please refer to the instructions on how to document this PR for the release notes.

...

@mkcor mkcor changed the title Use src layout and create skimage2 repo. Use src layout and create skimage2 directory. Aug 14, 2025
@lagru lagru added the 🔧 type: Maintenance Refactoring and maintenance of internals label Aug 14, 2025
@Czaki
Copy link
Copy Markdown
Contributor

Czaki commented Aug 14, 2025

The doc test fails because of lack of matplotlib

@stefanv stefanv force-pushed the create-skimage2-repo branch 2 times, most recently from 6873d19 to a807a76 Compare August 14, 2025 17:12
@stefanv stefanv force-pushed the create-skimage2-repo branch from a807a76 to e897593 Compare August 14, 2025 17:18
@stefanv stefanv force-pushed the create-skimage2-repo branch from 37be658 to aa7745b Compare August 14, 2025 21:06
@stefanv stefanv force-pushed the create-skimage2-repo branch from 21ff343 to a79cdc2 Compare August 14, 2025 22:41
lagru and others added 10 commits August 15, 2025 10:21
I'm not exactly sure why this is necessary to catch "skimage" too. Maybe
some part of the implementation raises the warning internally and
doesn't catch it. At the worst, this means users might see a warning
twice. I don't really care enough to investigate because we are
removing the whole thing.
Co-authored-by: Grzegorz Bokota <bokota@gmail.com>
Copy link
Copy Markdown
Member

@lagru lagru left a comment

Choose a reason for hiding this comment

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

Looks good. 😄

@lagru
Copy link
Copy Markdown
Member

lagru commented Aug 15, 2025

Don't merge yet, while we figure out how to fix the wheel building on the maintenance/create-skimage2-package branch.

It looks like that's a longer fix. We'll merge for now and will address the wheel building in another PR.

@lagru lagru merged commit 4c656e9 into scikit-image:main Aug 15, 2025
25 checks passed
@lagru lagru changed the title Use src layout and create skimage2 directory. Use src layout and create skimage2 directory Aug 15, 2025
@stefanv stefanv added this to the 0.26 milestone Aug 15, 2025
stefanv added a commit that referenced this pull request Aug 15, 2025
---------

Co-authored-by: Stefan van der Walt <stefanv@berkeley.edu>
Co-authored-by: Lars Grüter <lagru@mailbox.org>
Co-authored-by: Grzegorz Bokota <bokota@gmail.com>
Co-authored-by: Stefan van der Walt <stefan@mentat.za.net>
Co-authored-by: Grzegorz Bokota <bokota+github@gmail.com>
@mkcor mkcor deleted the create-skimage2-repo branch August 15, 2025 14:16
stefanv added a commit that referenced this pull request Jan 31, 2026
The changes in #7864 would include `--pyargs skimage` even if in cases
such as

```
spin test -- tests/skimage/...
```

which don't indicate that doctests should be run too. This fix makes
sure to only add `--pyargs` if the user doesn't give any indication
which tests are to be run in the form of positional arguments.

---------

Co-authored-by: Stefan van der Walt <sjvdwalt@gmail.com>
Co-authored-by: Matthew Brett <matthew.brett@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🔧 type: Maintenance Refactoring and maintenance of internals

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants