Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use packaging.version instead of distutils.StrictVersion #234

Merged
merged 1 commit into from
Dec 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions docker_squash/squash.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# -*- coding: utf-8 -*-

import os
from distutils.version import StrictVersion

import docker
from packaging import version as packaging_version

from docker_squash.errors import SquashError
from docker_squash.lib import common
Expand Down Expand Up @@ -64,7 +64,9 @@ def run(self):
% self.output_path
)

if StrictVersion(docker_version["ApiVersion"]) >= StrictVersion("1.22"):
if packaging_version.parse(
docker_version["ApiVersion"]
) >= packaging_version.parse("1.22"):
image = V2Image(
self.log,
self.docker,
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
docker
packaging