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.

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

Add Lazy loading to skimage.draw submodule #6971

Merged
merged 17 commits into from May 31, 2023

Conversation

decorouz
Copy link
Contributor

Description

Add lazy loading to skimage.draw submodule. #6964

Checklist

  • Docstrings for all functions
  • Gallery example in ./doc/examples (new features only)
  • Benchmark in ./benchmarks, if your changes aren't covered by an
    existing benchmark
  • Unit tests
  • Clean style in the spirit of PEP8
  • Descriptive commit messages (see below)

For reviewers

  • Check that the PR title is short, concise, and will make sense 1 year
    later.
  • Check that new functions are imported in corresponding __init__.py.
  • Check that new features, API changes, and deprecations are mentioned in
    doc/release/release_dev.rst.
  • There is a bot to help automate backporting a PR to an older branch. For
    example, to backport to v0.19.x after merging, add the following in a PR
    comment: @meeseeksdev backport to v0.19.x
  • To run benchmarks on a PR, add the run-benchmark label. To rerun, the label
    can be removed and then added again. The benchmark output can be checked in
    the "Actions" tab.

lagru
lagru previously approved these changes May 31, 2023
Copy link
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.

Thanks looks good.

skimage/draw/meson.build Outdated Show resolved Hide resolved
@lagru
Copy link
Member

lagru commented May 31, 2023

By the way @decorouz, your pull request seem to include unnecessary commits. How are you creating these feature branches? The common workflow to create a feature branch is usually:

git checkout main
git pull upstream main  # Pull new changes 
git checkout -b feature-branch  # Create new feature branch

If you ever need to incorporate new changes from main while working on a feature branch, I'd advise to do so with:

# Assumes you are already on the feature branch!
git fetch upstream
git fetch . upstream/main:main  # Fast-forward merge local main without switching branches
git merge main

@lagru lagru dismissed their stale review May 31, 2023 10:40

Still failing tests

@lagru
Copy link
Member

lagru commented May 31, 2023

Interesting, I can't reproduce the import error locally... 🤔

@lagru
Copy link
Member

lagru commented May 31, 2023

@decorouz I pushed an attempt to fix this. Please update your local branch with

git checkout lazy_loader_draw_submodule
git pull origin lazy_loader_draw_submodule

before you add new changes locally.

@decorouz
Copy link
Contributor Author

@lagru Thanks for the review and fix.

I figured I messed up the flow for incorporating new changes from main. I just didn't know how to fix it. Thanks for the suggestion. I have saved in a note for future reference.

Copy link
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.

CI is happy now.

@stefanv stefanv merged commit 0c17a8f into scikit-image:main May 31, 2023
24 checks passed
@stefanv
Copy link
Member

stefanv commented May 31, 2023

Thanks, @decorouz!

@jarrodmillman jarrodmillman added this to the 0.21 milestone May 31, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants