Repository: mesos Updated Branches: refs/heads/master 7148db0c8 -> b426d5adc
Made __init__.py get installed in $PREFIX/lib/pythonX.Y/site-packages/mesos. Review: https://reviews.apache.org/r/37081 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b426d5ad Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b426d5ad Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b426d5ad Branch: refs/heads/master Commit: b426d5adcaa1810e612981197a8e7160ea40d310 Parents: 7148db0 Author: haosdent huang <[email protected]> Authored: Wed Aug 5 17:41:29 2015 +0200 Committer: Bernd Mathiske <[email protected]> Committed: Wed Aug 5 17:41:29 2015 +0200 ---------------------------------------------------------------------- src/Makefile.am | 6 ++++-- src/python/interface/setup.py.in | 2 +- src/python/setup.py.in | 1 - 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/b426d5ad/src/Makefile.am ---------------------------------------------------------------------- diff --git a/src/Makefile.am b/src/Makefile.am index 54eaf20..35ebbbd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1245,10 +1245,12 @@ $(PYTHON_SOURCE): # the PYTHONPATH and imported. These end up being used for the tests. Wheels # can be easily uninstalled. They end up being what gets installed/uninstalled. MESOS_EGGS = \ + python/dist/mesos-$(PACKAGE_VERSION)$(PYTHON_EGG_PUREPY_POSTFIX).egg \ python/dist/mesos.interface-$(PACKAGE_VERSION)$(PYTHON_EGG_PUREPY_POSTFIX).egg \ python/dist/mesos.native-$(PACKAGE_VERSION)$(PYTHON_EGG_POSTFIX).egg MESOS_WHLS = \ + python/dist/mesos-$(PACKAGE_VERSION)$(PYTHON_WHL_PUREPY_POSTFIX).whl \ python/dist/mesos.interface-$(PACKAGE_VERSION)$(PYTHON_WHL_PUREPY_POSTFIX).whl \ python/dist/mesos.native-$(PACKAGE_VERSION)$(PYTHON_WHL_POSTFIX).whl @@ -1266,8 +1268,8 @@ $(MESOS_EGGS) $(MESOS_WHLS): \ CFLAGS="$(PYTHON_CFLAGS)" CPPFLAGS="$(PYTHON_CPPFLAGS)" \ LDFLAGS="$(PYTHON_LDFLAGS)" \ PYTHONPATH=$(abs_top_builddir)/$(DISTRIBUTE):$(abs_top_builddir)/$(WHEEL) \ - $(PYTHON) setup.py bdist_egg --dist-dir=../dist \ - bdist_wheel --dist-dir=../dist + $(PYTHON) setup.py bdist_egg --dist-dir=$(abs_top_builddir)/src/python/dist \ + bdist_wheel --dist-dir=$(abs_top_builddir)/src/python/dist CLEANFILES += $(MESOS_EGGS) $(MESOS_WHLS) python/*/build python/*/dist $(PYTHON_SOURCE) http://git-wip-us.apache.org/repos/asf/mesos/blob/b426d5ad/src/python/interface/setup.py.in ---------------------------------------------------------------------- diff --git a/src/python/interface/setup.py.in b/src/python/interface/setup.py.in index afcaf7a..880e2a6 100644 --- a/src/python/interface/setup.py.in +++ b/src/python/interface/setup.py.in @@ -24,7 +24,7 @@ config = { 'namespace_packages': [ 'mesos' ], 'packages': [ 'mesos', 'mesos.interface' ], 'package_dir': { '': 'src' }, - 'install_requires': [ 'protobuf>=2.5.0,<3' ], + 'install_requires': [ 'google-common>=0.0.1', 'protobuf>=2.5.0,<3' ], 'license': 'Apache 2.0', 'keywords': 'mesos', 'classifiers': [ ] http://git-wip-us.apache.org/repos/asf/mesos/blob/b426d5ad/src/python/setup.py.in ---------------------------------------------------------------------- diff --git a/src/python/setup.py.in b/src/python/setup.py.in index 304c4bf..8ffde68 100644 --- a/src/python/setup.py.in +++ b/src/python/setup.py.in @@ -21,7 +21,6 @@ config = { 'author': 'Apache Mesos', 'author_email': '[email protected]', 'url': 'http://pypi.python.org/pypi/mesos', - 'namespace_packages': [ 'mesos' ], 'packages': [ 'mesos' ], 'package_dir': { '': 'src' }, 'install_requires': [
