You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2016/05/03 14:11:02 UTC
mesos git commit: Updated Python tools from "distribute" to
"setuptools".
Repository: mesos
Updated Branches:
refs/heads/master 17260204c -> 9f472b1ef
Updated Python tools from "distribute" to "setuptools".
Review: https://reviews.apache.org/r/46813/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9f472b1e
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9f472b1e
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9f472b1e
Branch: refs/heads/master
Commit: 9f472b1eff904d0d96063d3bed535a8e81263d69
Parents: 1726020
Author: Zhiwei Chen <zh...@gmail.com>
Authored: Tue May 3 14:07:50 2016 +0200
Committer: Bernd Mathiske <be...@mesosphere.io>
Committed: Tue May 3 14:07:50 2016 +0200
----------------------------------------------------------------------
3rdparty/Makefile.am | 10 +++----
3rdparty/distribute-0.6.26.tar.gz | Bin 621193 -> 0 bytes
3rdparty/setuptools-20.9.0.tar.gz | Bin 0 -> 686397 bytes
3rdparty/versions.am | 2 +-
LICENSE | 2 +-
configure.ac | 36 ++++++++++++-------------
mpi/mpiexec-mesos.in | 8 +++---
src/Makefile.am | 12 ++++-----
src/examples/python/test-containerizer.in | 8 +++---
src/examples/python/test-executor.in | 8 +++---
src/examples/python/test-framework.in | 8 +++---
support/coverage.sh | 2 +-
12 files changed, 48 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/9f472b1e/3rdparty/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/Makefile.am b/3rdparty/Makefile.am
index 0523151..c9b3a25 100644
--- a/3rdparty/Makefile.am
+++ b/3rdparty/Makefile.am
@@ -32,17 +32,17 @@ CONFIGURE_ARGS = @CONFIGURE_ARGS@ --enable-shared=no --with-pic --srcdir=.
include versions.am
-DISTRIBUTE = distribute-$(DISTRIBUTE_VERSION)
LEVELDB = leveldb-$(LEVELDB_VERSION)
PIP = pip-$(PIP_VERSION)
+SETUPTOOLS = setuptools-$(SETUPTOOLS_VERSION)
WHEEL = wheel-$(WHEEL_VERSION)
ZOOKEEPER = zookeeper-$(ZOOKEEPER_VERSION)
EXTRA_DIST = \
- $(DISTRIBUTE).tar.gz \
$(LEVELDB).tar.gz \
$(PIP).tar.gz \
+ $(SETUPTOOLS).tar.gz \
$(WHEEL).tar.gz \
$(ZOOKEEPER).tar.gz
@@ -56,9 +56,9 @@ EXTRA_DIST += \
$(ZOOKEEPER).patch
CLEAN_EXTRACTED = \
- $(DISTRIBUTE) \
$(LEVELDB) \
$(PIP) \
+ $(SETUPTOOLS) \
$(WHEEL) \
$(ZOOKEEPER)
@@ -74,8 +74,8 @@ CLEAN_EXTRACTED = \
ALL_LOCAL = # Initialize ALL_LOCAL so we can add to it.
if HAS_PYTHON
-if WITH_BUNDLED_DISTRIBUTE
- ALL_LOCAL += $(DISTRIBUTE)-stamp
+if WITH_BUNDLED_SETUPTOOLS
+ ALL_LOCAL += $(SETUPTOOLS)-stamp
endif
if WITH_BUNDLED_PIP
http://git-wip-us.apache.org/repos/asf/mesos/blob/9f472b1e/3rdparty/distribute-0.6.26.tar.gz
----------------------------------------------------------------------
diff --git a/3rdparty/distribute-0.6.26.tar.gz b/3rdparty/distribute-0.6.26.tar.gz
deleted file mode 100644
index 3a598cc..0000000
Binary files a/3rdparty/distribute-0.6.26.tar.gz and /dev/null differ
http://git-wip-us.apache.org/repos/asf/mesos/blob/9f472b1e/3rdparty/setuptools-20.9.0.tar.gz
----------------------------------------------------------------------
diff --git a/3rdparty/setuptools-20.9.0.tar.gz b/3rdparty/setuptools-20.9.0.tar.gz
new file mode 100644
index 0000000..4ce08d3
Binary files /dev/null and b/3rdparty/setuptools-20.9.0.tar.gz differ
http://git-wip-us.apache.org/repos/asf/mesos/blob/9f472b1e/3rdparty/versions.am
----------------------------------------------------------------------
diff --git a/3rdparty/versions.am b/3rdparty/versions.am
index a94723e..a00c3b0 100644
--- a/3rdparty/versions.am
+++ b/3rdparty/versions.am
@@ -19,8 +19,8 @@
# third-party packages in exactly one place. For now, however, we
# still need to update version numbers in src/python/setup.py.in too!
-DISTRIBUTE_VERSION = 0.6.26
LEVELDB_VERSION = 1.4
PIP_VERSION = 7.1.2
+SETUPTOOLS_VERSION = 20.9.0
WHEEL_VERSION = 0.24.0
ZOOKEEPER_VERSION = 3.4.8
http://git-wip-us.apache.org/repos/asf/mesos/blob/9f472b1e/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 19130d9..4426b1e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -240,7 +240,7 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
======================================================================
-For distribute-0.6.26 (3rdparty/distribute-0.6.26.tar.gz):
+For setuptools-20.9.0 (3rdparty/setuptools-20.9.0.tar.gz):
======================================================================
PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
http://git-wip-us.apache.org/repos/asf/mesos/blob/9f472b1e/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index ae91a07..0b9683b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -249,12 +249,12 @@ AC_ARG_WITH([nvml-lib],
(required for Nvidia GPU support)]),
[], [])
-AC_ARG_ENABLE([bundled-distribute],
- AS_HELP_STRING([--disable-bundled-distribute],
- [excludes building and using the bundled distribute
+AC_ARG_ENABLE([bundled-setuptools],
+ AS_HELP_STRING([--disable-bundled-setuptools],
+ [excludes building and using the bundled setuptools
package in lieu of an installed version in
PYTHONPATH]),
- [without_bundled_distribute=yes], [])
+ [without_bundled_setuptools=yes], [])
AC_ARG_ENABLE([bundled-pip],
AS_HELP_STRING([--disable-bundled-pip],
@@ -1492,9 +1492,9 @@ There are two possible workarounds for this issue:
mesos-ec2 services will not function.
-------------------------------------------------------------------]))
- # Check if user has asked us to use a preinstalled distribute, or if
+ # Check if user has asked us to use a preinstalled setuptools, or if
# they asked us to ignore all bundled libraries while compiling and linking.
- if test "x$without_bundled_distribute" = "xyes" || \
+ if test "x$without_bundled_setuptools" = "xyes" || \
test "x$enable_bundled" != "xyes"; then
AC_PYTHON_MODULE([distutils], [no])
@@ -1502,29 +1502,29 @@ mesos-ec2 services will not function.
AC_PYTHON_MODULE([setuptools], [no])
if test "x$HAVE_PYMOD_setuptools" = "xyes"; then
- found_distribute=yes
+ found_setuptools=yes
fi
else
- found_distribute=yes
+ found_setuptools=yes
fi
- if test "x$found_distribute" = "xyes"; then
- with_bundled_distribute=no
+ if test "x$found_setuptools" = "xyes"; then
+ with_bundled_setuptools=no
else
- AC_MSG_ERROR([cannot find distribute
+ AC_MSG_ERROR([cannot find setuptools
-------------------------------------------------------------------
-You have requested the use of a non-bundled distribute but no suitable
-distribute could be found.
+You have requested the use of a non-bundled setuptools but no suitable
+setuptools could be found.
-You may want specify the location of distribute by providing a prefix
-path via --with-distribute=DIR, or check that the path you provided is
+You may want specify the location of setuptools by providing a prefix
+path via --with-setuptools=DIR, or check that the path you provided is
correct if you're already doing this.
-------------------------------------------------------------------
])
fi
else
- with_bundled_distribute=yes
+ with_bundled_setuptools=yes
fi
# Check if user has asked us to use a preinstalled pip, or if
@@ -1580,8 +1580,8 @@ fi
AM_CONDITIONAL([HAS_PYTHON], [test "x$has_python" = "xyes"])
-AM_CONDITIONAL([WITH_BUNDLED_DISTRIBUTE],
- [test "x$with_bundled_distribute" = "xyes"])
+AM_CONDITIONAL([WITH_BUNDLED_SETUPTOOLS],
+ [test "x$with_bundled_setuptools" = "xyes"])
AM_CONDITIONAL([WITH_BUNDLED_PIP],
[test "x$with_bundled_pip" = "xyes"])
AM_CONDITIONAL([WITH_BUNDLED_WHEEL],
http://git-wip-us.apache.org/repos/asf/mesos/blob/9f472b1e/mpi/mpiexec-mesos.in
----------------------------------------------------------------------
diff --git a/mpi/mpiexec-mesos.in b/mpi/mpiexec-mesos.in
index 021dd5b..3bdd683 100644
--- a/mpi/mpiexec-mesos.in
+++ b/mpi/mpiexec-mesos.in
@@ -16,11 +16,11 @@ test ! -z "${PYTHON}" && \
PYTHON=@PYTHON@
-DISTRIBUTE=`echo ${MESOS_BUILD_DIR}/3rdparty/distribute-*/`
+SETUPTOOLS=`echo ${MESOS_BUILD_DIR}/3rdparty/setuptools-*/`
# Just warn in the case when build with --disable-bundled.
-test ! -e ${DISTRIBUTE} && \
- echo "${RED}Failed to find ${DISTRIBUTE}${NORMAL}"
+test ! -e ${SETUPTOOLS} && \
+ echo "${RED}Failed to find ${SETUPTOOLS}${NORMAL}"
PROTOBUF=`echo ${MESOS_BUILD_DIR}/3rdparty/libprocess/3rdparty/protobuf-*/python/`
@@ -35,5 +35,5 @@ test ! -e ${SCRIPT} && \
echo "${RED}Failed to find ${SCRIPT}${NORMAL}" && \
exit 1
-PYTHONPATH="${DISTRIBUTE}:${PROTOBUF}:${MESOS_EGGS}" \
+PYTHONPATH="${SETUPTOOLS}:${PROTOBUF}:${MESOS_EGGS}" \
exec ${PYTHON} ${SCRIPT} "${@}"
http://git-wip-us.apache.org/repos/asf/mesos/blob/9f472b1e/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 53de98f..2ba82a7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,10 +25,10 @@ include ../3rdparty/libprocess/3rdparty/versions.am
# TODO(charles): Move these into an included automakefile and have
# them include $(top_builddir) as appropriate.
-DISTRIBUTE = 3rdparty/distribute-$(DISTRIBUTE_VERSION)
+LEVELDB = 3rdparty/leveldb-$(LEVELDB_VERSION)
PIP = 3rdparty/pip-$(PIP_VERSION)
+SETUPTOOLS = 3rdparty/setuptools-$(SETUPTOOLS_VERSION)
WHEEL = 3rdparty/wheel-$(WHEEL_VERSION)
-LEVELDB = 3rdparty/leveldb-$(LEVELDB_VERSION)
ZOOKEEPER = 3rdparty/zookeeper-$(ZOOKEEPER_VERSION)/src/c
ZOOKEEPER_JAR = 3rdparty/zookeeper-$(ZOOKEEPER_VERSION)/zookeeper-$(ZOOKEEPER_VERSION).jar
LIBPROCESS = 3rdparty/libprocess
@@ -617,7 +617,7 @@ zookeeper_HEADERS = \
# We even use a convenience library for most of Mesos so that we can
-# exclude third party libraries so setuptools/distribute can build a
+# exclude third party libraries so setuptools can build a
# self-contained Python library and statically link in the third party
# libraries themselves.
noinst_LTLIBRARIES += libmesos_no_3rdparty.la
@@ -1591,7 +1591,7 @@ $(PROTOBUF_EGG):
CXX="$(CXX)" \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)" \
- PYTHONPATH=$(abs_top_builddir)/$(DISTRIBUTE) \
+ PYTHONPATH=$(abs_top_builddir)/$(SETUPTOOLS) \
$(PYTHON) setup.py build bdist_egg
CLEANFILES += $(PROTOBUF_EGG)
@@ -1651,13 +1651,13 @@ $(MESOS_EGGS) $(MESOS_WHLS): \
LIBS="$(LIBS)" CC="$(CC)" CXX="$(CXX)" \
CFLAGS="$(PYTHON_CFLAGS)" CPPFLAGS="$(PYTHON_CPPFLAGS)" \
LDFLAGS="$(PYTHON_LDFLAGS)" \
- PYTHONPATH=$(abs_top_builddir)/$(DISTRIBUTE):$(abs_top_builddir)/$(WHEEL) \
+ PYTHONPATH=$(abs_top_builddir)/$(SETUPTOOLS):$(abs_top_builddir)/$(WHEEL) \
$(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)
-pippythonpath = $(DESTDIR)$(pythondir):$(abs_top_builddir)/$(DISTRIBUTE):$(abs_top_builddir)/$(PIP):$(abs_top_builddir)/$(WHEEL)
+pippythonpath = $(DESTDIR)$(pythondir):$(abs_top_builddir)/$(SETUPTOOLS):$(abs_top_builddir)/$(PIP):$(abs_top_builddir)/$(WHEEL)
# Some python installations create their own distutils.cfg (homebrew, redhat).
# This includes `prefix=` which overrides anything set via. pip during install.
http://git-wip-us.apache.org/repos/asf/mesos/blob/9f472b1e/src/examples/python/test-containerizer.in
----------------------------------------------------------------------
diff --git a/src/examples/python/test-containerizer.in b/src/examples/python/test-containerizer.in
index b8258e7..1516fd1 100644
--- a/src/examples/python/test-containerizer.in
+++ b/src/examples/python/test-containerizer.in
@@ -14,11 +14,11 @@ test ! -z "${PYTHON}" && \
PYTHON=@PYTHON@
-DISTRIBUTE=`echo ${MESOS_BUILD_DIR}/3rdparty/distribute-*/`
+SETUPTOOLS=`echo ${MESOS_BUILD_DIR}/3rdparty/setuptools-*/`
# Just warn in the case when build with --disable-bundled.
-test ! -e ${DISTRIBUTE} && \
- echo "${RED}Failed to find ${DISTRIBUTE}${NORMAL}"
+test ! -e ${SETUPTOOLS} && \
+ echo "${RED}Failed to find ${SETUPTOOLS}${NORMAL}"
PROTOBUF=`echo ${MESOS_BUILD_DIR}/3rdparty/libprocess/3rdparty/protobuf-*/python/`
@@ -33,5 +33,5 @@ test ! -e ${SCRIPT} && \
echo "${RED}Failed to find ${SCRIPT}${NORMAL}" && \
exit 1
-PYTHONPATH="${DISTRIBUTE}:${PROTOBUF}:${MESOS_EGGS}" \
+PYTHONPATH="${SETUPTOOLS}:${PROTOBUF}:${MESOS_EGGS}" \
exec ${PYTHON} ${SCRIPT} "${@}"
http://git-wip-us.apache.org/repos/asf/mesos/blob/9f472b1e/src/examples/python/test-executor.in
----------------------------------------------------------------------
diff --git a/src/examples/python/test-executor.in b/src/examples/python/test-executor.in
index 6be0ad2..93fd175 100644
--- a/src/examples/python/test-executor.in
+++ b/src/examples/python/test-executor.in
@@ -14,11 +14,11 @@ test ! -z "${PYTHON}" && \
PYTHON=@PYTHON@
-DISTRIBUTE=`echo ${MESOS_BUILD_DIR}/3rdparty/distribute-*/`
+SETUPTOOLS=`echo ${MESOS_BUILD_DIR}/3rdparty/setuptools-*/`
# Just warn in the case when build with --disable-bundled.
-test ! -e ${DISTRIBUTE} && \
- echo "${RED}Failed to find ${DISTRIBUTE}${NORMAL}"
+test ! -e ${SETUPTOOLS} && \
+ echo "${RED}Failed to find ${SETUPTOOLS}${NORMAL}"
PROTOBUF=`echo ${MESOS_BUILD_DIR}/3rdparty/libprocess/3rdparty/protobuf-*/python/`
@@ -33,5 +33,5 @@ test ! -e ${SCRIPT} && \
echo "${RED}Failed to find ${SCRIPT}${NORMAL}" && \
exit 1
-PYTHONPATH="${DISTRIBUTE}:${PROTOBUF}:${MESOS_EGGS}" \
+PYTHONPATH="${SETUPTOOLS}:${PROTOBUF}:${MESOS_EGGS}" \
exec ${PYTHON} ${SCRIPT} "${@}"
http://git-wip-us.apache.org/repos/asf/mesos/blob/9f472b1e/src/examples/python/test-framework.in
----------------------------------------------------------------------
diff --git a/src/examples/python/test-framework.in b/src/examples/python/test-framework.in
index 59bab82..22301fa 100644
--- a/src/examples/python/test-framework.in
+++ b/src/examples/python/test-framework.in
@@ -14,11 +14,11 @@ test ! -z "${PYTHON}" && \
PYTHON=@PYTHON@
-DISTRIBUTE=`echo ${MESOS_BUILD_DIR}/3rdparty/distribute-*/`
+SETUPTOOLS=`echo ${MESOS_BUILD_DIR}/3rdparty/setuptools-*/`
# Just warn in the case when build with --disable-bundled.
-test ! -e ${DISTRIBUTE} && \
- echo "${RED}Failed to find ${DISTRIBUTE}${NORMAL}"
+test ! -e ${SETUPTOOLS} && \
+ echo "${RED}Failed to find ${SETUPTOOLS}${NORMAL}"
PROTOBUF=`echo ${MESOS_BUILD_DIR}/3rdparty/libprocess/3rdparty/protobuf-*/python/`
@@ -37,5 +37,5 @@ test ! -e ${SCRIPT} && \
# framework is able to find the executor.
cd `dirname ${0}`
-PYTHONPATH="${DISTRIBUTE}:${PROTOBUF}:${MESOS_EGGS}" \
+PYTHONPATH="${SETUPTOOLS}:${PROTOBUF}:${MESOS_EGGS}" \
exec ${PYTHON} ${SCRIPT} "${@}"
http://git-wip-us.apache.org/repos/asf/mesos/blob/9f472b1e/support/coverage.sh
----------------------------------------------------------------------
diff --git a/support/coverage.sh b/support/coverage.sh
index 7edfec2..8a3d75d 100755
--- a/support/coverage.sh
+++ b/support/coverage.sh
@@ -38,7 +38,7 @@ lcov --directory . -c -o mesos_test.info
LCOV_FILTERS="/usr/include/*"
LCOV_FILTERS+=" /usr/lib/jvm/*"
LCOV_FILTERS+=" mesos/build/*"
-LCOV_FILTERS+=" build/3rdparty/distribute-*"
+LCOV_FILTERS+=" build/3rdparty/setuptools-*"
LCOV_FILTERS+=" build/3rdparty/leveldb*"
LCOV_FILTERS+=" build/3rdparty/zookeeper-*"
LCOV_FILTERS+=" *libprocess/3rdparty/boost-*"