Skip to content
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

Build manpages as part of sdist #53728

Merged
merged 2 commits into from Mar 18, 2019

Conversation

Projects
None yet
5 participants
@abadger
Copy link
Member

abadger commented Mar 13, 2019

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

setup.py
Makefile

ADDITIONAL INFORMATION

Needed for building rpms on RHEL8

@abadger abadger changed the title Allow python override build tools Build manpages as part of sdist Mar 13, 2019

@abadger abadger force-pushed the abadger:allow-python-override-build-tools branch from a9ea614 to ffda380 Mar 13, 2019

@ansibot ansibot added needs_revision and removed core_review labels Mar 13, 2019

@abadger abadger force-pushed the abadger:allow-python-override-build-tools branch from ffda380 to 017f736 Mar 13, 2019

@ansibot

This comment has been minimized.

Copy link
Contributor

ansibot commented Mar 13, 2019

The test ansible-test sanity --test pep8 [explain] failed with 2 errors:

setup.py:132:26: E128 continuation line under-indented for visual indent
setup.py:133:26: E128 continuation line under-indented for visual indent

click here for bot help

@abadger abadger force-pushed the abadger:allow-python-override-build-tools branch from 017f736 to 6f88730 Mar 13, 2019

@nitzmahone nitzmahone requested a review from mattclay Mar 14, 2019

@nitzmahone
Copy link
Member

nitzmahone left a comment

LGTM, but @mattclay should review as well, since he added the plugin changelog gen stuff

@ansibot ansibot added core_review and removed needs_revision labels Mar 14, 2019

@mattclay mattclay removed the needs_triage label Mar 14, 2019

@@ -175,6 +175,8 @@ def load_plugins(version, force_reload):
LOGGER.info('refreshing plugin cache')

plugins_data['version'] = version

plugins_data['plugins'] = {}

This comment has been minimized.

@mattclay

mattclay Mar 14, 2019

Member

#53792 will fix this and enforce the correct types for sections.

@@ -582,7 +584,7 @@ def combine(fragments):

result[section] += content
else:
result[section] = content
result[section] = [content]

This comment has been minimized.

@mattclay

mattclay Mar 14, 2019

Member

#53792 adds type checking for the sections so this won't be needed.

The changelog fragments with the incorrect types were fixed in #53790

@ansibot ansibot added needs_revision and removed core_review labels Mar 14, 2019

Build fixups
This is in pursuit of making snapshots easier.

* Allow overriding the python command used for generating man pages
* Build the changelog prior to creating the sdist
* Add the uninstalled ansible library to PYTHONPATH for changelog
  generation
* Warn that python setup.py sdist may be incomplete; use make sdist
  or make snapshot instead.
* Implement a snapshot make command

@abadger abadger force-pushed the abadger:allow-python-override-build-tools branch from 6f88730 to c781aba Mar 14, 2019

@abadger

This comment has been minimized.

Copy link
Member Author

abadger commented Mar 14, 2019

Updated to remove the changes to the changelog script that are taken care of by either #53792 or #53790

Show resolved Hide resolved setup.py Outdated
Show resolved Hide resolved setup.py
# output
if os.environ.get('_ANSIBLE_SDIST_FROM_MAKEFILE', False) != 1:
warnings.warn('When setup.py sdist is run from outside of the Makefile,'
' the generated tarball may be incomplete. Use `make snapshot`'

This comment has been minimized.

@webknjaz

webknjaz Mar 14, 2019

Member

Maybe "may be missing some of non-runtime-critical artifacts"?

This comment has been minimized.

@abadger

abadger Mar 14, 2019

Author Member

Lots of jargon in that wording. And there's no guarantee that the missing things will be non-runtime-critical in the future either....

This comment has been minimized.

@webknjaz

webknjaz Mar 15, 2019

Member

It's just an example. I just want it to be less scary.

Fix environ variable test to use a string
Co-Authored-By: abadger <a.badger@gmail.com>

@abadger abadger merged commit 5ba7063 into ansible:devel Mar 18, 2019

1 check passed

Shippable Run 113967 status is SUCCESS.
Details

@abadger abadger deleted the abadger:allow-python-override-build-tools branch Mar 18, 2019

@abadger

This comment has been minimized.

Copy link
Member Author

abadger commented Mar 18, 2019

Merged

catcombo added a commit to catcombo/ansible that referenced this pull request Mar 21, 2019

Build manpages as part of sdist (ansible#53728)
* Build fixups

This is in pursuit of making snapshots easier.

* Allow overriding the python command used for generating man pages
* Build the changelog prior to creating the sdist
* Add the uninstalled ansible library to PYTHONPATH for changelog
  generation
* Warn that python setup.py sdist may be incomplete; use make sdist
  or make snapshot instead.
* Implement a snapshot make command

* Fix environ variable test to use a string

Co-Authored-By: abadger <a.badger@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.