Merge pull request #5092 from ctiller/no_more_flag

Change default on Python install option
pull/5085/merge
Jan Tattermusch 9 years ago
commit beb55c3b46
  1. 2
      setup.py
  2. 2
      src/python/grpcio/commands.py
  3. 20
      test/distrib/python/run_distrib_test.sh
  4. 5
      tools/dockerfile/distribtest/python_arch_x64/Dockerfile
  5. 2
      tools/dockerfile/distribtest/python_centos6_x64/Dockerfile
  6. 4
      tools/run_tests/build_artifact_python.sh

@ -118,6 +118,8 @@ def cython_extensions(package_names, module_names, extra_sources, include_dirs,
sources=[module_file] + extra_sources,
include_dirs=include_dirs, libraries=libraries,
define_macros=define_macros,
extra_compile_args=list(CFLAGS),
extra_link_args=list(LDFLAGS),
) for (module_name, module_file) in zip(module_names, module_files)
]
if build_with_cython:

@ -135,7 +135,7 @@ class Install(install.install, EggNameMixin):
def initialize_options(self):
install.install.initialize_options(self)
self.use_grpc_custom_bdist = False
self.use_grpc_custom_bdist = bool(int(os.environ.get('GRPC_PYTHON_USE_CUSTOM_BDIST', '1')))
def finalize_options(self):
install.install.finalize_options(self)

@ -42,17 +42,17 @@ then
exit 1
fi
# TODO(jtattermusch): this shouldn't be required
pip install --upgrade six
PIP=pip2
which $PIP || PIP=pip
PYTHON=python2
which $PYTHON || PYTHON=python
# TODO(jtattermusch): if these don't get preinstalled, pip tries to install them
# with --use-grpc-custom-bdist option, which obviously fails.
pip install --upgrade enum34
pip install --upgrade futures
# TODO(jtattermusch): this shouldn't be required
$PIP install --upgrade six
GRPC_PYTHON_BINARIES_REPOSITORY="${BDIST_DIR}" \
pip install \
"${SDIST_ARCHIVE}" \
--install-option="--use-grpc-custom-bdist"
$PIP install \
"${SDIST_ARCHIVE}"
$PYTHON distribtest.py
python distribtest.py

@ -30,6 +30,7 @@
FROM base/archlinux
RUN pacman --noconfirm -Syy
RUN pacman --noconfirm -S python
RUN pacman --noconfirm -S python-pip
RUN pacman --noconfirm -S openssl
RUN pacman --noconfirm -S python2
RUN pacman --noconfirm -S python2-pip

@ -34,3 +34,5 @@ RUN yum install -y python
RUN rpm -ivh http://dl.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.noarch.rpm
RUN yum install -y python-pip
RUN pip install --upgrade pip

@ -39,7 +39,9 @@ then
pip install -rrequirements.txt
fi
GRPC_PYTHON_BUILD_WITH_CYTHON=1 ${SETARCH_CMD} python setup.py \
GRPC_PYTHON_USE_CUSTOM_BDIST=0 \
GRPC_PYTHON_BUILD_WITH_CYTHON=1 \
${SETARCH_CMD} python setup.py \
bdist_wheel \
sdist \
bdist_egg_grpc_custom

Loading…
Cancel
Save