8000 BUG: fix release snippet failures caught only after merging by mattip · Pull Request #14526 · numpy/numpy · GitHub
[go: up one dir, main page]

Skip to content

BUG: fix release snippet failures caught only after merging #14526

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 2 commits into from
Sep 16, 2019

Conversation

mattip
Copy link
Member
@mattip mattip commented Sep 16, 2019

#14514 added a test for building towncrier notes. For some reason the test passed in the merge even though it left master with a bad file name?

@mattip mattip changed the title BUG: change non-compliant file name BUG: fix release snippet failures caught only after merging Sep 16, 2019
@@ -1687,8 +1687,6 @@ def add_npy_pkg_config(self, template, install_dir, subst_dict=None):

and will be installed as foo.ini in the 'lib' subpath.

Cross-compilation
-----------------
Copy link
Member Author

Choose a reason for hiding this comment

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

This is not a valid docstring section name

If ``drop_fields`` is used to drop all fields, previously the array would
be completely discarded and ``None`` returned. Now it returns an array of the
be completely discarded and `None` returned. Now it returns an array of the
same shape as the input, but with no fields. The old behavior can be retained
Copy link
Member

Choose a reason for hiding this comment

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

Was this note really broken?

Copy link
Member Author

Choose a reason for hiding this comment

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

The note was fine. The issue is that when the template consumes it, no blank line was added after the note. That meant the code block had no blank line after it, which sphinx RST doesn't like.

Copy link
Member

Choose a reason for hiding this comment

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

OK, I think I like the solution of just adding a bit of text under the fragment best. Feels a bit wrong that there is no better way, but if we like the autmatic addition of the link it is a bit tricky (unless we remove automatic whitespace stripping, but...). Did not realize None was fine with single quotes.

@seberg
Copy link
Member
seberg commented Sep 16, 2019

OK, let me put this in before test failures start to be annoying. Thanks Matti.

@seberg seberg merged commit 6e75b9a into numpy:master Sep 16, 2019
@mattip
Copy link
Member Author
mattip commented Sep 16, 2019

If a better solution is found, it can be merged. Also we could have replaced this line with XXXX REMOVE ME since the final release note will most likely need a little fixup during the actual release.

@mattip mattip deleted the fix-towncrier branch June 8, 2020 06:58
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.

3 participants
0