From 4040afe48f24d4f434a255ffad7a85438e77bf8f Mon Sep 17 00:00:00 2001 From: Boris Sabatier Date: Thu, 14 Nov 2019 16:46:02 +0100 Subject: [PATCH 1/3] Use distro instead of platform for getting linux_distribution --- scripts/curl_install_pypi/install.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/curl_install_pypi/install.py b/scripts/curl_install_pypi/install.py index a200dfa8556..f8e583ea2d3 100644 --- a/scripts/curl_install_pypi/install.py +++ b/scripts/curl_install_pypi/install.py @@ -24,6 +24,7 @@ import shutil import subprocess import hashlib +import distro try: # Attempt to load python 3 module from urllib.request import urlopen @@ -306,7 +307,7 @@ def _native_dependencies_for_dist(verify_cmd_args, install_cmd_args, dep_list): raise CLIInstallError('Please install the native dependencies and try again.') def verify_native_dependencies(): - distname, version, _ = platform.linux_distribution() + distname, version, _ = distro.linux_distribution() if not distname: # There's no distribution name so can't determine native dependencies required / or they may not be needed like on OS X return From dbd6e4b5ad230e8a682f6bfa0d35eb0afedc8835 Mon Sep 17 00:00:00 2001 From: Boris Sabatier Date: Thu, 14 Nov 2019 16:47:20 +0100 Subject: [PATCH 2/3] Update virtualenv for supporting python3.8 --- scripts/curl_install_pypi/install.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/curl_install_pypi/install.py b/scripts/curl_install_pypi/install.py index f8e583ea2d3..bf7171d2f96 100644 --- a/scripts/curl_install_pypi/install.py +++ b/scripts/curl_install_pypi/install.py @@ -43,10 +43,10 @@ {install_dir}/bin/python -m azure.cli "$@" """ -VIRTUALENV_VERSION = '15.0.0' +VIRTUALENV_VERSION = '16.7.7' VIRTUALENV_ARCHIVE = 'virtualenv-'+VIRTUALENV_VERSION+'.tar.gz' VIRTUALENV_DOWNLOAD_URL = 'https://pypi.python.org/packages/source/v/virtualenv/'+VIRTUALENV_ARCHIVE -VIRTUALENV_ARCHIVE_SHA256 = '70d63fb7e949d07aeb37f6ecc94e8b60671edb15b890aa86dba5dfaf2225dc19' +VIRTUALENV_ARCHIVE_SHA256 = 'd257bb3773e48cac60e475a19b608996c73f4d333b3ba2e4e57d5ac6134e0136' DEFAULT_INSTALL_DIR = os.path.expanduser(os.path.join('~', 'lib', 'azure-cli')) DEFAULT_EXEC_DIR = os.path.expanduser(os.path.join('~', 'bin')) From e6a324aa8bd811b2245a5f89c27e358fcaf34d51 Mon Sep 17 00:00:00 2001 From: Boris Sabatier Date: Thu, 14 Nov 2019 16:51:40 +0100 Subject: [PATCH 3/3] Update HISTORY.rst --- src/azure-cli/HISTORY.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst index dc8cacbd69c..e411c632032 100644 --- a/src/azure-cli/HISTORY.rst +++ b/src/azure-cli/HISTORY.rst @@ -3,6 +3,9 @@ Release History =============== +**Install** +* Install script support python 3.8 + **Azure Red Hat OpenShift** * Add `--workspace-resource-id` flag to allow creation of Azure Red Hat Openshift cluster with monitoring