[Freeipa-devel] [freeipa PR#686][synchronized] Stabilize make pypi_packages
URL: https://github.com/freeipa/freeipa/pull/686 Author: tiran Title: #686: Stabilize make pypi_packages Action: synchronized 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 be5f43167ed99b9cb508d92a833f5c1acb996140 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Mon, 3 Apr 2017 13:35:58 +0200 Subject: [PATCH] Stabilize make pypi_packages Parallel make or flags like IPA_OMIT_INSTALL and IPA_SERVER_WHEELS could lead to bad packages for PyPI. Only build the packages we want with correct flags. Placeholder packages from 'make pypi_package' conflict with 'make wheel_bundle' packages. Use a separate destination directory for PyPI packages. Signed-off-by: Christian Heimes --- Makefile.am | 20 +++- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1989b19..ab69f49 100644 --- a/Makefile.am +++ b/Makefile.am @@ -254,6 +254,7 @@ endif # WITH_JSLINT .PHONY: bdist_wheel wheel_bundle wheel_placeholder pypi_packages WHEELDISTDIR = $(top_builddir)/dist/wheels +WHEELPYPIDIR = $(top_builddir)/dist/pypi WHEELBUNDLEDIR = $(top_builddir)/dist/bundle @MK_IFEQ@ ($(IPA_SERVER_WHEELS),1) @@ -273,6 +274,9 @@ $(WHEELDISTDIR): $(WHEELBUNDLEDIR): mkdir -p $(WHEELBUNDLEDIR) +$(WHEELPYPIDIR): + mkdir -p $(WHEELPYPIDIR) + bdist_wheel: $(WHEELDISTDIR) rm -f $(foreach item,$(IPA_WHEEL_PACKAGES) ipatests,$(WHEELDISTDIR)/$(item)-*.whl) export IPA_OMIT_INSTALL=$(IPA_OMIT_INSTALL); \ @@ -291,14 +295,20 @@ wheel_bundle: $(WHEELBUNDLEDIR) bdist_wheel .wheelconstraints --wheel-dir $(WHEELBUNDLEDIR) \ $(IPA_WHEEL_PACKAGES) $(IPA_EXTRA_WHEELS) -wheel_placeholder: $(WHEELDISTDIR) +pypi_packages: $(WHEELPYPIDIR) .wheelconstraints + rm -f $(WHEELPYPIDIR)/* + for dir in $(IPACLIENT_SUBDIRS); do \ + $(MAKE) $(AM_MAKEFLAGS) \ + IPA_OMIT_INSTALL=1 WHEELDISTDIR=$(abspath $(WHEELPYPIDIR)) \ + -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; \ + $(MAKE) $(AM_MAKEFLAGS) \ + IPA_OMIT_INSTALL=1 WHEELDISTDIR=$(abspath $(WHEELPYPIDIR)) \ + -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" + @echo -e "twine upload $(WHEELPYPIDIR)/*-$(VERSION)-py2.py3-none-any.whl\n" .PHONY: strip-po: -- 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
[Freeipa-devel] [freeipa PR#686][synchronized] Stabilize make pypi_packages
URL: https://github.com/freeipa/freeipa/pull/686 Author: tiran Title: #686: Stabilize make pypi_packages Action: synchronized 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 b166396212a0e5505e2c10213368ca6cb98878e6 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Mon, 3 Apr 2017 13:35:58 +0200 Subject: [PATCH] Stabilize 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. Placeholder packages from 'make pypi_package' conflict with 'make wheel_bundle' packages. Use a separate destination directory for PyPI packages. Signed-off-by: Christian Heimes --- Makefile.am | 20 +++- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1989b19..ab69f49 100644 --- a/Makefile.am +++ b/Makefile.am @@ -254,6 +254,7 @@ endif # WITH_JSLINT .PHONY: bdist_wheel wheel_bundle wheel_placeholder pypi_packages WHEELDISTDIR = $(top_builddir)/dist/wheels +WHEELPYPIDIR = $(top_builddir)/dist/pypi WHEELBUNDLEDIR = $(top_builddir)/dist/bundle @MK_IFEQ@ ($(IPA_SERVER_WHEELS),1) @@ -273,6 +274,9 @@ $(WHEELDISTDIR): $(WHEELBUNDLEDIR): mkdir -p $(WHEELBUNDLEDIR) +$(WHEELPYPIDIR): + mkdir -p $(WHEELPYPIDIR) + bdist_wheel: $(WHEELDISTDIR) rm -f $(foreach item,$(IPA_WHEEL_PACKAGES) ipatests,$(WHEELDISTDIR)/$(item)-*.whl) export IPA_OMIT_INSTALL=$(IPA_OMIT_INSTALL); \ @@ -291,14 +295,20 @@ wheel_bundle: $(WHEELBUNDLEDIR) bdist_wheel .wheelconstraints --wheel-dir $(WHEELBUNDLEDIR) \ $(IPA_WHEEL_PACKAGES) $(IPA_EXTRA_WHEELS) -wheel_placeholder: $(WHEELDISTDIR) +pypi_packages: $(WHEELPYPIDIR) .wheelconstraints + rm -f $(WHEELPYPIDIR)/* + for dir in $(IPACLIENT_SUBDIRS); do \ + $(MAKE) $(AM_MAKEFLAGS) \ + IPA_OMIT_INSTALL=1 WHEELDISTDIR=$(abspath $(WHEELPYPIDIR)) \ + -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; \ + $(MAKE) $(AM_MAKEFLAGS) \ + IPA_OMIT_INSTALL=1 WHEELDISTDIR=$(abspath $(WHEELPYPIDIR)) \ + -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" + @echo -e "twine upload $(WHEELPYPIDIR)/*-$(VERSION)-py2.py3-none-any.whl\n" .PHONY: strip-po: -- 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
[Freeipa-devel] [freeipa PR#686][synchronized] Stabilize make pypi_packages
URL: https://github.com/freeipa/freeipa/pull/686 Author: tiran Title: #686: Stabilize make pypi_packages Action: synchronized 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 f65a36954f261c4c02a2de2232e7f83a72b6e86a Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Mon, 3 Apr 2017 13:35:58 +0200 Subject: [PATCH] Stabilize 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. Placeholder packages from 'make pypi_package' conflict with 'make wheel_bundle' packages. Use a separate destination directory for PyPI packages. Signed-off-by: Christian Heimes --- Makefile.am | 20 +++- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1989b19..e93ceac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -254,6 +254,7 @@ endif # WITH_JSLINT .PHONY: bdist_wheel wheel_bundle wheel_placeholder pypi_packages WHEELDISTDIR = $(top_builddir)/dist/wheels +WHEELPYPIDIR = $(top_builddir)/dist/pypi WHEELBUNDLEDIR = $(top_builddir)/dist/bundle @MK_IFEQ@ ($(IPA_SERVER_WHEELS),1) @@ -273,6 +274,9 @@ $(WHEELDISTDIR): $(WHEELBUNDLEDIR): mkdir -p $(WHEELBUNDLEDIR) +$(WHEELPYPIDIR): + mkdir -p $(WHEELPYPIDIR) + bdist_wheel: $(WHEELDISTDIR) rm -f $(foreach item,$(IPA_WHEEL_PACKAGES) ipatests,$(WHEELDISTDIR)/$(item)-*.whl) export IPA_OMIT_INSTALL=$(IPA_OMIT_INSTALL); \ @@ -291,14 +295,20 @@ wheel_bundle: $(WHEELBUNDLEDIR) bdist_wheel .wheelconstraints --wheel-dir $(WHEELBUNDLEDIR) \ $(IPA_WHEEL_PACKAGES) $(IPA_EXTRA_WHEELS) -wheel_placeholder: $(WHEELDISTDIR) +pypi_packages: $(WHEELPYPIDIR) .wheelconstraints + rm -f $(WHEELPYPIDIR)/* + for dir in $(IPACLIENT_SUBDIRS); do \ + $(MAKE) $(AM_MAKEFLAGS) \ + IPA_OMIT_INSTALL=1 WHEELDISTDIR=$(abspath $(WHEELPYPIDIR)) \ + -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; \ + $(MAKE) $(AM_MAKEFLAGS) \ + IPA_OMIT_INSTALL=1 WHEELDISTDIR=$(abspath $(WHEELPYPIDIR)) \ + -C $${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" + @echo -e "twine upload $(WHEELPYPIDIR)/*-$(VERSION)-py2.py3-none-any.whl\n" .PHONY: strip-po: -- 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