You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by lf...@apache.org on 2020/12/17 14:21:37 UTC
[incubator-datalab] 01/03: [DATALAB-2091]: made some py3 related
changes
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 956f8f05e4738b836d41780bf09f8a23baacd471
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Fri Nov 20 15:20:27 2020 +0200
[DATALAB-2091]: made some py3 related changes
---
infrastructure-provisioning/scripts/deploy_datalab.py | 2 +-
infrastructure-provisioning/src/base/entrypoint.py | 2 +-
.../src/general/files/gcp/base_Dockerfile | 9 ++++-----
.../src/general/lib/os/debian/common_lib.py | 2 +-
infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py | 2 +-
infrastructure-provisioning/src/ssn/fabfile.py | 2 +-
6 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/infrastructure-provisioning/scripts/deploy_datalab.py b/infrastructure-provisioning/scripts/deploy_datalab.py
index 530f19b..2e8b7e0 100644
--- a/infrastructure-provisioning/scripts/deploy_datalab.py
+++ b/infrastructure-provisioning/scripts/deploy_datalab.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/infrastructure-provisioning/src/base/entrypoint.py b/infrastructure-provisioning/src/base/entrypoint.py
index 4780acf..c8b5eb4 100644
--- a/infrastructure-provisioning/src/base/entrypoint.py
+++ b/infrastructure-provisioning/src/base/entrypoint.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
diff --git a/infrastructure-provisioning/src/general/files/gcp/base_Dockerfile b/infrastructure-provisioning/src/general/files/gcp/base_Dockerfile
index 0590753..ba5274a 100644
--- a/infrastructure-provisioning/src/general/files/gcp/base_Dockerfile
+++ b/infrastructure-provisioning/src/general/files/gcp/base_Dockerfile
@@ -26,12 +26,11 @@ ARG SRC_PATH
# Install any .deb dependecies
RUN apt-get update && \
apt-get -y upgrade && \
- apt-get -y install python-pip python-dev groff vim less git wget nano libssl-dev libffi-dev libffi6 && \
+ apt-get -y install python3-pip python-dev groff vim less git wget nano libssl-dev libffi-dev libffi6 && \
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-# Install any python dependencies
-RUN pip install -UI qtconsole==4.7.7 pip==20.1 && \
- pip install boto3 backoff fabric==1.14.0 fabvenv argparse ujson jupyter pycrypto google-api-python-client google-cloud-storage \
+RUN pip3 install -UI pip==20.1 && \
+ pip3 install boto3 backoff fab-classic fabvenv argparse ujson jupyter pycrypto google-api-python-client google-cloud-storage \
pyyaml google-auth-httplib2 oauth2client
# Configuring ssh for user
@@ -58,7 +57,7 @@ RUN mkdir -p /root/conf && \
mkdir -p /root/scripts && \
mkdir -p /root/templates && \
mkdir -p /root/files && \
- mkdir -p /usr/lib/python2.7/datalab && \
+ mkdir -p /usr/lib/python3.6/datalab && \
mkdir -p /root/keys/.ssh
COPY ${SRC_PATH}base/ /root
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
index a5f3984..8f8c5ae 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
index ee53977..5968aa2 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
diff --git a/infrastructure-provisioning/src/ssn/fabfile.py b/infrastructure-provisioning/src/ssn/fabfile.py
index a004520..47da688 100644
--- a/infrastructure-provisioning/src/ssn/fabfile.py
+++ b/infrastructure-provisioning/src/ssn/fabfile.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# *****************************************************************************
#
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org