提交 bbd42192 编写于 作者: L Liangliang He

Restore to python 2.7

上级 f0a12e80
...@@ -82,7 +82,6 @@ ENV LINARO_ARM_LINUX_GNUEABIHF /opt/gcc-linaro-7.3.1-2018.05-x86_64_arm-linux-gn ...@@ -82,7 +82,6 @@ ENV LINARO_ARM_LINUX_GNUEABIHF /opt/gcc-linaro-7.3.1-2018.05-x86_64_arm-linux-gn
ENV LINARO_AARCH64_LINUX_GNU /opt/gcc-linaro-7.3.1-2018.05-x86_64_aarch64-linux-gnu ENV LINARO_AARCH64_LINUX_GNU /opt/gcc-linaro-7.3.1-2018.05-x86_64_aarch64-linux-gnu
ENV PATH /opt/protoc-3.6.1/bin:${PATH} ENV PATH /opt/protoc-3.6.1/bin:${PATH}
RUN pyenv install 2.7.12 RUN pyenv install 2.7.12
RUN pyenv global 2.7.12 RUN pyenv global 2.7.12
RUN pip install -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com --upgrade pip setuptools RUN pip install -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com --upgrade pip setuptools
...@@ -112,6 +111,3 @@ RUN pip install -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors ...@@ -112,6 +111,3 @@ RUN pip install -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors
RUN pip install -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com \ RUN pip install -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com \
cpplint==1.4.4 cpplint==1.4.4
# Restore to python3
RUN pyenv global 3.6.3
...@@ -17,4 +17,5 @@ help: ...@@ -17,4 +17,5 @@ help:
# Catch-all target: route all unknown targets to Sphinx using the new # Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). # "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile %: Makefile
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) pyenv local 3.6.3
\ No newline at end of file @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
...@@ -244,8 +244,6 @@ class DeviceWrapper: ...@@ -244,8 +244,6 @@ class DeviceWrapper:
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
stdout=subprocess.PIPE) stdout=subprocess.PIPE)
out, err = p.communicate() out, err = p.communicate()
out = str(out, encoding='utf-8')
err = str(err, encoding='utf-8')
self.stdout = err + out self.stdout = err + out
six.print_(self.stdout) six.print_(self.stdout)
six.print_("Running finished!\n") six.print_("Running finished!\n")
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册