Skip to content

Collect doc files based primarily on an inclusion list #9947

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

Merged
merged 1 commit into from
Jan 10, 2025

Conversation

jepler
Copy link

@jepler jepler commented Jan 10, 2025

It frequently arises that files were inadvertently included in the doc build, because it was based on a series of exclude patterns, but new filenames that don't match the exclude patterns are frequently created by new build systems, new submodules, un-tidy developer source trees, etc.

So, use include_patterns as a set of positive patterns, then weed out a few specific items that otherwise match the include patterns.

This also fixes a diagnostic printed by setuptools_scm during make stubs or make html about incorrect configuration.

Testing performed: make html before & after these changes & compared the list of generated html files. The filenames matched. I didn't compare the file content.

@jepler jepler requested a review from dhalbert January 10, 2025 21:38
Copy link
Collaborator

@dhalbert dhalbert left a comment

Choose a reason for hiding this comment

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

The stubs build failed in the docs build ☹️ . I'll stop the rest of the jobs.

@jepler
Copy link
Author

jepler commented Jan 10, 2025

serves me right for messing with two things.

It frequently arises that files were inadvertently included in the doc
build, because it was based on a series of exclude patterns, but new
filenames that don't match the exclude patterns are frequently created
by new build systems, new submodules, un-tidy developer source trees, etc.

So, use include_patterns as a set of positive patterns, then weed out
a few specific items that otherwise match the include patterns.
@jepler jepler force-pushed the sphinx-prefer-include-list branch from 9d87e06 to 5be0974 Compare January 10, 2025 22:38
@jepler
Copy link
Author

jepler commented Jan 10, 2025

Updated to just include the include-list change.

Copy link
Collaborator

@dhalbert dhalbert 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! I looked up some things in the doc artifact and they looked fine.

@dhalbert dhalbert merged commit 04608a3 into adafruit:main Jan 10, 2025
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants