diff options
| author | Zuul <zuul@review.opendev.org> | 2023-09-11 20:04:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-09-11 20:04:00 +0000 |
| commit | e183e9a21e615476262c4380f7c8e6ed17a80a3b (patch) | |
| tree | 3bd5c715ce656082d1d3b02890d657914d1e0dae | |
| parent | 7b020af8ab68f2aba328f0e51cc873f6e4d41e30 (diff) | |
| parent | fd5ec1ca18eeec65e4d0b6d345a3232d2159ba51 (diff) | |
| download | kolla-e183e9a21e615476262c4380f7c8e6ed17a80a3b.tar.gz kolla-e183e9a21e615476262c4380f7c8e6ed17a80a3b.zip | |
Merge "build: distutils.StrictVersion() is deprecated"
| -rw-r--r-- | kolla/image/build.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index 2c0388416..41cc11708 100644 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -13,13 +13,13 @@ import contextlib import json import logging +import packaging import queue import shutil import sys import threading import time -from distutils.version import StrictVersion from kolla.common import config as common_config from kolla.common import utils from kolla.engine_adapter import engine @@ -114,7 +114,7 @@ def run_build(): if conf.engine == engine.Engine.DOCKER.value: try: import docker - StrictVersion(docker.__version__) + packaging.version.parse(docker.__version__) except ImportError: LOG.error("Error, you have set Docker as container engine, " "but the Python library is not found." |
