Skip to content

CI cleanup#7693

Merged
jarrodmillman merged 7 commits intoscikit-image:mainfrom
stefanv:ci-cleanup
Feb 3, 2025
Merged

CI cleanup#7693
jarrodmillman merged 7 commits intoscikit-image:mainfrom
stefanv:ci-cleanup

Conversation

@stefanv
Copy link
Member

@stefanv stefanv commented Feb 2, 2025

This is hopefully the last of it:

  • Renames files to be consistent (dashes instead of underscores, .yaml instead of .yml).
  • Moves GitHub scripts into the .github folder.
  • Move tests for various platforms (macOS, windows, Linux) into separate files.
    Also separate out docs build.
  • Nightly wheels for py313t is now only needed to Cython (the others have been published on PyPi).
  • Remove unused scripts.

@stefanv stefanv added the 🤖 type: Infrastructure CI, packaging, tools and automation label Feb 2, 2025
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.

Nice bit of cleaning up! 😊 Renaming and splitting also very much makes sense to me. Should make our CI way easier to parse.

Could even look into cleaning up https://github.com/scikit-image/scikit-image/actions once things have settled down.

Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Member Author

Choose a reason for hiding this comment

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

It seems to work OK, but if it causes trouble we can move it back out.

Comment on lines 35 to 37
- name: Install test dependencies
run: |
source .github/scripts/setup_test_env.sh
Copy link
Member

Choose a reason for hiding this comment

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

Do we even need the test dependencies here?

Copy link
Member Author

Choose a reason for hiding this comment

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

No, good point, I'll remove.

Comment on lines 73 to 75
test_docs_aarch64:
name: macos-docs
runs-on: ubuntu-24.04-arm
Copy link
Member

Choose a reason for hiding this comment

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

Seems duplicate with test-docs.yaml. Did you forget to remove this?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, that was wrong; removed.

@stefanv
Copy link
Member Author

stefanv commented Feb 2, 2025

Could even look into cleaning up https://github.com/scikit-image/scikit-image/actions once things have settled down.

Yes! I was hoping you could help me with that, since I recall you doing it before.

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.

Looks great. :) Thanks.

Comment on lines 31 to 34
- name: Build docs / run examples
run: |
source .github/scripts/setup-docs-env.sh
SPHINXCACHE=${HOME}/.cache/sphinx SPHINXOPTS="-W -j auto" make -C doc html
Copy link
Member

Choose a reason for hiding this comment

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

Actually a small quality of life improvement:

Suggested change
- name: Build docs / run examples
run: |
source .github/scripts/setup-docs-env.sh
SPHINXCACHE=${HOME}/.cache/sphinx SPHINXOPTS="-W -j auto" make -C doc html
- name: Install doc dependencies
run: |
source .github/scripts/setup-docs-env.sh
- name: Build docs / run examples
run: |
SPHINXCACHE=${HOME}/.cache/sphinx SPHINXOPTS="-W -j auto" make -C doc html

Should it somewhat easier to review sphinx output without scrolling through is pip's output before it that's mostly noise.

@stefanv
Copy link
Member Author

stefanv commented Feb 3, 2025

One more thing we should add to CI: caching.

@jarrodmillman jarrodmillman merged commit 74bef72 into scikit-image:main Feb 3, 2025
24 checks passed
matthew-brett added a commit to matthew-brett/scikit-image that referenced this pull request Feb 4, 2025
…ailure

* origin/main:
  Add zizmor to pre-commit; address GH workflow issues raised (scikit-image#7662)
  Reenable test marked as flaky on Azure. (scikit-image#7694)
  Simultaneously resolve all dependencies; add pip caching (scikit-image#7690)
  Copy keypoints if necessary to preserve contiguity (scikit-image#7692)
  CI cleanup (scikit-image#7693)
  Port CI testing from Azure to GitHub (scikit-image#7687)
  Lower CI build verbosity
  Use pytest config in pyproject.toml in CI (scikit-image#7555)
  Improve docstring for rolling_ball function. (scikit-image#7682)
@stefanv stefanv added this to the 0.25.2 milestone Feb 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🤖 type: Infrastructure CI, packaging, tools and automation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants