URL: https://github.com/freeipa/freeipa/pull/686 Author: tiran Title: #686: Stablize make pypi_packages Action: opened
PR body: """ Parallel make or flags like IPA_OMIT_INSTALL and IPA_SERVER_WHEELS could like to bad packages for PyPI. Only build the packages we want with correct flags. Signed-off-by: Christian Heimes <chei...@redhat.com> """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/686/head:pr686 git checkout pr686
From c74930e6aa97604b9fcd08456b41b5be73310b15 Mon Sep 17 00:00:00 2001 From: Christian Heimes <chei...@redhat.com> Date: Mon, 3 Apr 2017 13:35:58 +0200 Subject: [PATCH] Stablize make pypi_packages Parallel make or flags like IPA_OMIT_INSTALL and IPA_SERVER_WHEELS could like to bad packages for PyPI. Only build the packages we want with correct flags. Signed-off-by: Christian Heimes <chei...@redhat.com> --- Makefile.am | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1989b19..e201663 100644 --- a/Makefile.am +++ b/Makefile.am @@ -252,7 +252,7 @@ jslint-html: jsl -nologo -nosummary -nofilelisting -conf jsl.conf endif # WITH_JSLINT -.PHONY: bdist_wheel wheel_bundle wheel_placeholder pypi_packages +.PHONY: bdist_wheel wheel_bundle pypi_packages WHEELDISTDIR = $(top_builddir)/dist/wheels WHEELBUNDLEDIR = $(top_builddir)/dist/bundle @@ -291,12 +291,15 @@ wheel_bundle: $(WHEELBUNDLEDIR) bdist_wheel .wheelconstraints --wheel-dir $(WHEELBUNDLEDIR) \ $(IPA_WHEEL_PACKAGES) $(IPA_EXTRA_WHEELS) -wheel_placeholder: $(WHEELDISTDIR) +pypi_packages: $(WHEELDISTDIR) + rm -f $(WHEELBUNDLEDIR)/* + export IPA_OMIT_INSTALL=1; \ + for dir in $(IPACLIENT_SUBDIRS); do \ + $(MAKE) $(AM_MAKEFLAGS) -C $${dir} bdist_wheel || exit 1; \ + done; \ for dir in $(IPA_PLACEHOLDERS); do \ $(MAKE) $(AM_MAKEFLAGS) -C $(top_srcdir)/pypi/$${dir} bdist_wheel || exit 1; \ done - -pypi_packages: bdist_wheel wheel_placeholder @echo -e "\n\nTo upload packages to PyPI, run:\n" @echo -e " twine upload $(WHEELDISTDIR)/*-$(VERSION)-py2.py3-none-any.whl\n"
-- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code