Skip to content

Skip __main__.py#232

Merged
bsipocz merged 3 commits intoscientific-python:mainfrom
flying-sheep:fix-main
Nov 6, 2023
Merged

Skip __main__.py#232
bsipocz merged 3 commits intoscientific-python:mainfrom
flying-sheep:fix-main

Conversation

@flying-sheep
Copy link
Contributor

Fixes #229

@pllim pllim added the bug label Nov 3, 2023
@pllim pllim added this to the 1.1.0 milestone Nov 3, 2023
@pllim
Copy link
Contributor

pllim commented Nov 3, 2023

Thanks! Please also add a change log entry to https://github.com/scientific-python/pytest-doctestplus/blob/main/CHANGES.rst

flying-sheep and others added 2 commits November 3, 2023 14:45
Co-authored-by: P. L. Lim <2090236+pllim@users.noreply.github.com>
@pllim
Copy link
Contributor

pllim commented Nov 3, 2023

The diff LGTM! I would use the "Squash and Merge" button but it is currently disabled by this repo.

@bsipocz , should we enable "Squash and Merge"?

Copy link
Contributor

@pllim pllim left a comment

Choose a reason for hiding this comment

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

Thanks!

@pllim pllim requested a review from bsipocz November 3, 2023 13:53
@flying-sheep
Copy link
Contributor Author

Sure 😄

I don’t quite get your “Nitpick” change though: I preserved the number of newlines between the last changelog entry and the next header intentionally 😉

@pllim
Copy link
Contributor

pllim commented Nov 3, 2023

I don’t quite get your “Nitpick” change though

Yeah, sorry. Strictly speaking, preserving the existing number of blank lines is more correct, though I do not really care if it is two or one, personally.

@bsipocz
Copy link
Member

bsipocz commented Nov 3, 2023

I don't like squash and merge and would not like to use it here, instead prefer to use the release scripts to do changelog consistency and nitpicks prior release, rather than in the PRs.

@flying-sheep
Copy link
Contributor Author

Is there anything left to do for me or is this good to go?

Copy link
Member

@bsipocz bsipocz left a comment

Choose a reason for hiding this comment

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

I've removed the nitpick and revert commit, and will go ahead with merging. Thanks @flying-sheep!

@bsipocz bsipocz merged commit f61f87d into scientific-python:main Nov 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Tries to import __main__.py

3 participants