From 07cf1d6213b0d288761bfe3a31c1d44cdddbdd93 Mon Sep 17 00:00:00 2001 From: Tim Bielawa Date: Fri, 26 Aug 2016 11:53:00 -0700 Subject: Try using parse_version from pkg_resources instead --- utils/src/ooinstall/cli_installer.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'utils') diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py index 9420ec287..6b81f7721 100644 --- a/utils/src/ooinstall/cli_installer.py +++ b/utils/src/ooinstall/cli_installer.py @@ -6,8 +6,8 @@ import os import re import sys import logging -import setuptools.version import click +from pkg_resources import parse_version from ooinstall import openshift_ansible from ooinstall.oo_config import OOConfig from ooinstall.oo_config import OOConfigInvalidHostError @@ -631,9 +631,9 @@ https://docs.openshift.com/enterprise/latest/admin_guide/install/prerequisites.h oo_cfg.deployment.variables['master_routingconfig_subdomain'] = get_master_routingconfig_subdomain() click.clear() - current_version = setuptools.version.pkg_resources.parse_version( + current_version = parse_version( oo_cfg.settings.get('variant_version', '0.0')) - min_version = setuptools.version.pkg_resources.parse_version('3.2') + min_version = parse_version('3.2') if not oo_cfg.settings.get('openshift_http_proxy', None) and \ current_version >= min_version: http_proxy, https_proxy, proxy_excludes = get_proxy_hostnames_and_excludes() -- cgit v1.2.1