-
-
Notifications
You must be signed in to change notification settings - Fork 60
blurb: replace spaces with underscores in news directory #499
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
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
0367715
Remove unused code
hugovk 535fc6a
Add tests
hugovk 3a84a69
Add some type annotations
hugovk 67869b3
Use dashes instead of spaces in paths
hugovk 36bd99f
Don't install flit
hugovk 66bc9e0
Build and install package, then test installed package
hugovk e69848d
Install build
hugovk e68c9fe
Install in place for easier test coverage
hugovk 9bb59f4
Test on Python 3.12
hugovk 53ca535
Remove type hints
hugovk f98656d
Use underscores instead of dashes for spaces
hugovk 53cae52
Sort the *normalized* filenames for blurb release.
larryhastings 8e53d4a
Add glob_blurbs test for sorting by filename
hugovk acc9e05
Change docstring grammar
hugovk 22b23c9
Merge branch 'main' into no-spaces
hugovk 3e0a0ba
Merge remote-tracking branch 'upstream/main' into no-spaces
hugovk f63fea1
Replace replace.replace with dict.get
hugovk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Add tests
- Loading branch information
commit 535fc6a24f7d7cab160d60a925558b3eea5ac7ea
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
# .coveragerc to control coverage.py | ||
|
||
[report] | ||
# Regexes for lines to exclude from consideration | ||
exclude_lines = | ||
# Have to re-enable the standard pragma: | ||
pragma: no cover | ||
|
||
# Don't complain if non-runnable code isn't run: | ||
if __name__ == .__main__.: | ||
def main | ||
|
||
[run] | ||
omit = | ||
**/blurb/__main__.py |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,127 @@ | ||
import pytest | ||
from pyfakefs.fake_filesystem import FakeFilesystem | ||
|
||
import blurb | ||
|
||
|
||
@pytest.mark.parametrize( | ||
"section, expected", | ||
( | ||
("C API", "C API"), | ||
("Core and Builtins", "Core and Builtins"), | ||
("Library", "Library"), | ||
("Tools/Demos", "Tools-Demos"), | ||
), | ||
) | ||
def test_sanitize_section(section: str, expected: str) -> None: | ||
sanitized = blurb.sanitize_section(section) | ||
assert sanitized == expected | ||
|
||
|
||
@pytest.mark.parametrize( | ||
"section, expected", | ||
( | ||
("C API", "C API"), | ||
("Core and Builtins", "Core and Builtins"), | ||
("Library", "Library"), | ||
("Tools-Demos", "Tools/Demos"), | ||
), | ||
) | ||
def test_unsanitize_section(section: str, expected: str) -> None: | ||
unsanitized = blurb.unsanitize_section(section) | ||
assert unsanitized == expected | ||
|
||
|
||
def test_glob_blurbs_next(fs: FakeFilesystem) -> None: | ||
# Arrange | ||
fake_news_entries = ( | ||
"Misc/NEWS.d/next/Library/2022-04-11-18-34-33.gh-issue-11111.pC7gnM.rst", | ||
"Misc/NEWS.d/next/Core and Builtins/2023-03-17-12-09-45.gh-issue-33333.Pf_BI7.rst", | ||
"Misc/NEWS.d/next/Tools-Demos/2023-03-21-01-27-07.gh-issue-44444.2F1Byz.rst", | ||
"Misc/NEWS.d/next/C API/2023-03-27-22-09-07.gh-issue-66666.3SN8Bs.rst", | ||
) | ||
fake_readmes = ( | ||
"Misc/NEWS.d/next/Library/README.rst", | ||
"Misc/NEWS.d/next/Core and Builtins/README.rst", | ||
"Misc/NEWS.d/next/Tools-Demos/README.rst", | ||
"Misc/NEWS.d/next/C API/README.rst", | ||
) | ||
for fn in fake_news_entries + fake_readmes: | ||
fs.create_file(fn) | ||
|
||
# Act | ||
filenames = blurb.glob_blurbs("next") | ||
|
||
# Assert | ||
assert set(filenames) == set(fake_news_entries) | ||
|
||
|
||
@pytest.mark.parametrize( | ||
"news_entry, expected_section", | ||
( | ||
( | ||
"Misc/NEWS.d/next/Library/2022-04-11-18-34-33.gh-issue-11111.pC7gnM.rst", | ||
"Library", | ||
), | ||
( | ||
"Misc/NEWS.d/next/Core and Builtins/2023-03-17-12-09-45.gh-issue-33333.Pf_BI7.rst", | ||
"Core and Builtins", | ||
), | ||
( | ||
"Misc/NEWS.d/next/Tools-Demos/2023-03-21-01-27-07.gh-issue-44444.2F1Byz.rst", | ||
"Tools/Demos", | ||
), | ||
( | ||
"Misc/NEWS.d/next/C API/2023-03-27-22-09-07.gh-issue-66666.3SN8Bs.rst", | ||
"C API", | ||
), | ||
), | ||
) | ||
def test_load_next(news_entry: str, expected_section: str, fs: FakeFilesystem) -> None: | ||
# Arrange | ||
fs.create_file(news_entry, contents="testing") | ||
blurbs = blurb.Blurbs() | ||
|
||
# Act | ||
blurbs.load_next(news_entry) | ||
|
||
# Assert | ||
metadata = blurbs[0][0] | ||
assert metadata["section"] == expected_section | ||
|
||
|
||
@pytest.mark.parametrize( | ||
"news_entry, expected_path", | ||
( | ||
( | ||
"Misc/NEWS.d/next/Library/2022-04-11-18-34-33.gh-issue-11111.pC7gnM.rst", | ||
"root/Misc/NEWS.d/next/Library/2022-04-11-18-34-33.gh-issue-11111.pC7gnM.rst", | ||
), | ||
( | ||
"Misc/NEWS.d/next/Core and Builtins/2023-03-17-12-09-45.gh-issue-33333.Pf_BI7.rst", | ||
"root/Misc/NEWS.d/next/Core and Builtins/2023-03-17-12-09-45.gh-issue-33333.Pf_BI7.rst", | ||
), | ||
( | ||
"Misc/NEWS.d/next/Tools-Demos/2023-03-21-01-27-07.gh-issue-44444.2F1Byz.rst", | ||
"root/Misc/NEWS.d/next/Tools-Demos/2023-03-21-01-27-07.gh-issue-44444.2F1Byz.rst", | ||
), | ||
( | ||
"Misc/NEWS.d/next/C API/2023-03-27-22-09-07.gh-issue-66666.3SN8Bs.rst", | ||
"root/Misc/NEWS.d/next/C API/2023-03-27-22-09-07.gh-issue-66666.3SN8Bs.rst", | ||
), | ||
), | ||
) | ||
def test_extract_next_filename( | ||
news_entry: str, expected_path: str, fs: FakeFilesystem | ||
) -> None: | ||
# Arrange | ||
fs.create_file(news_entry, contents="testing") | ||
blurb.root = "root" | ||
blurbs = blurb.Blurbs() | ||
blurbs.load_next(news_entry) | ||
|
||
# Act | ||
path = blurbs._extract_next_filename() | ||
|
||
# Assert | ||
assert path == expected_path |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.