This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
The following commit(s) were added to refs/heads/trunk by this push:
new 7f65c971 Replace distutils.version with ccmlib.version
7f65c971 is described below
commit 7f65c971952c70fda8716c6f8faa5648b74cb060
Author: Mick Semb Wever <[email protected]>
AuthorDate: Sat Dec 13 23:49:50 2025 +0100
Replace distutils.version with ccmlib.version
patch by Mick Semb Wever; reviewed by Dmitry Kropachev for CASSANDRA-18321
---
auth_test.py | 2 +-
bootstrap_test.py | 2 +-
client_network_stop_start_test.py | 2 +-
commitlog_test.py | 2 +-
compaction_test.py | 2 +-
compression_test.py | 2 +-
configuration_test.py | 2 +-
conftest.py | 2 +-
counter_test.py | 2 +-
cql_test.py | 2 +-
cql_tracing_test.py | 2 +-
cqlsh_tests/test_cqlsh.py | 2 +-
cqlsh_tests/test_cqlsh_copy.py | 2 +-
dtest.py | 2 +-
dtest_setup.py | 2 +-
jmx_auth_test.py | 2 +-
jmx_test.py | 2 +-
json_test.py | 2 +-
materialized_views_test.py | 2 +-
paging_test.py | 2 +-
pending_range_test.py | 2 +-
pushed_notifications_test.py | 2 +-
read_repair_test.py | 2 +-
repair_tests/deprecated_repair_test.py | 2 +-
repair_tests/incremental_repair_test.py | 2 +-
replace_address_test.py | 2 +-
replication_test.py | 2 +-
requirements.txt | 2 +-
secondary_indexes_test.py | 2 +-
snapshot_test.py | 2 +-
sstable_generation_loading_test.py | 2 +-
topology_test.py | 2 +-
ttl_test.py | 2 +-
upgrade_tests/cql_tests.py | 2 +-
upgrade_tests/upgrade_base.py | 2 +-
upgrade_tests/upgrade_supercolumns_test.py | 2 +-
upgrade_tests/upgrade_through_versions_test.py | 2 +-
upgrade_tests/upgrade_udtfix_test.py | 2 +-
user_functions_test.py | 2 +-
39 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/auth_test.py b/auth_test.py
index 1f0dec10..6332c2c0 100644
--- a/auth_test.py
+++ b/auth_test.py
@@ -3,7 +3,7 @@ import string
import time
from collections import namedtuple
from datetime import datetime, timedelta
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
import re
import pytest
import logging
diff --git a/bootstrap_test.py b/bootstrap_test.py
index 4c09f0b7..885b3578 100644
--- a/bootstrap_test.py
+++ b/bootstrap_test.py
@@ -7,7 +7,7 @@ import threading
import time
import logging
import signal
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
from cassandra import ConsistencyLevel
from cassandra.concurrent import execute_concurrent_with_args
diff --git a/client_network_stop_start_test.py
b/client_network_stop_start_test.py
index bc95ca5e..a1caf92e 100644
--- a/client_network_stop_start_test.py
+++ b/client_network_stop_start_test.py
@@ -7,7 +7,7 @@ import string
import time
from ccmlib.node import TimeoutError
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
from dtest import Tester
from tools import sslkeygen
diff --git a/commitlog_test.py b/commitlog_test.py
index 54f21719..1cf9da3d 100644
--- a/commitlog_test.py
+++ b/commitlog_test.py
@@ -4,7 +4,7 @@ import os
import stat
import struct
import time
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
import pytest
import logging
diff --git a/compaction_test.py b/compaction_test.py
index 2f7c62f3..c318303b 100644
--- a/compaction_test.py
+++ b/compaction_test.py
@@ -4,7 +4,7 @@ import re
import string
import tempfile
import time
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
import pytest
import parse
import logging
diff --git a/compression_test.py b/compression_test.py
index cb7fa88d..61dad24f 100644
--- a/compression_test.py
+++ b/compression_test.py
@@ -3,7 +3,7 @@ import pytest
import logging
from dtest import create_ks
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
from scrub_test import TestHelper
from tools.assertions import assert_crc_check_chance_equal
diff --git a/configuration_test.py b/configuration_test.py
index 51bbab1f..7e43576c 100644
--- a/configuration_test.py
+++ b/configuration_test.py
@@ -8,7 +8,7 @@ from cassandra.concurrent import execute_concurrent_with_args
from dtest import Tester, create_ks
from tools.jmxutils import (JolokiaAgent, make_mbean)
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
logger = logging.getLogger(__name__)
ported_to_in_jvm = pytest.mark.ported_to_in_jvm
diff --git a/conftest.py b/conftest.py
index dc7829cc..dcd5f47f 100644
--- a/conftest.py
+++ b/conftest.py
@@ -10,7 +10,7 @@ import re
import shutil
import time
from datetime import datetime
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
# Python 3 imports
from itertools import zip_longest
diff --git a/counter_test.py b/counter_test.py
index 2a9837d7..5638733f 100644
--- a/counter_test.py
+++ b/counter_test.py
@@ -10,7 +10,7 @@ from cassandra.query import SimpleStatement
from tools.assertions import assert_invalid, assert_length_equal, assert_one
from dtest import Tester, create_ks, create_cf, mk_bman_path
from tools.data import rows_to_list
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
since = pytest.mark.since
logger = logging.getLogger(__name__)
diff --git a/cql_test.py b/cql_test.py
index 30c5507d..a6c0d446 100644
--- a/cql_test.py
+++ b/cql_test.py
@@ -13,7 +13,7 @@ from cassandra.policies import FallthroughRetryPolicy
from cassandra.query import SimpleStatement
from dtest import Tester, create_ks, mk_bman_path
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
from thrift_bindings.thrift010.ttypes import \
ConsistencyLevel as ThriftConsistencyLevel
from thrift_bindings.thrift010.ttypes import (CfDef, Column,
ColumnOrSuperColumn,
diff --git a/cql_tracing_test.py b/cql_tracing_test.py
index 881557df..72d53dea 100644
--- a/cql_tracing_test.py
+++ b/cql_tracing_test.py
@@ -1,7 +1,7 @@
import pytest
import logging
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
from dtest import Tester, create_ks
diff --git a/cqlsh_tests/test_cqlsh.py b/cqlsh_tests/test_cqlsh.py
index ba19dc30..af433382 100644
--- a/cqlsh_tests/test_cqlsh.py
+++ b/cqlsh_tests/test_cqlsh.py
@@ -16,7 +16,7 @@ import tempfile
import pytest
from decimal import Decimal
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
from tempfile import NamedTemporaryFile
from uuid import UUID, uuid4
diff --git a/cqlsh_tests/test_cqlsh_copy.py b/cqlsh_tests/test_cqlsh_copy.py
index 396de32e..aeceaa99 100644
--- a/cqlsh_tests/test_cqlsh_copy.py
+++ b/cqlsh_tests/test_cqlsh_copy.py
@@ -12,7 +12,7 @@ import re
import time
from collections import namedtuple
from decimal import Decimal
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
from tempfile import NamedTemporaryFile, gettempdir, template
from uuid import uuid1, uuid4
diff --git a/dtest.py b/dtest.py
index 50ef420c..8170da48 100644
--- a/dtest.py
+++ b/dtest.py
@@ -8,7 +8,7 @@ import sys
import threading
import time
import traceback
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
import pytest
import cassandra
diff --git a/dtest_setup.py b/dtest_setup.py
index 23c9b2e5..712360cc 100644
--- a/dtest_setup.py
+++ b/dtest_setup.py
@@ -22,7 +22,7 @@ from ccmlib.extension import get_cluster_class
from dtest import (get_ip_from_node, make_execution_profile,
get_auth_provider, get_port_from_node,
get_eager_protocol_version, hack_legacy_parsing)
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
from tools.context import log_filter
from tools.funcutils import merge_dicts
diff --git a/jmx_auth_test.py b/jmx_auth_test.py
index e5b3d03c..8d8e742e 100644
--- a/jmx_auth_test.py
+++ b/jmx_auth_test.py
@@ -2,7 +2,7 @@ import random
import string
import pytest
import logging
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
from ccmlib.node import ToolError
from dtest import Tester
diff --git a/jmx_test.py b/jmx_test.py
index bc5f8b12..4c2959ee 100644
--- a/jmx_test.py
+++ b/jmx_test.py
@@ -8,7 +8,7 @@ import logging
import ccmlib.common
from ccmlib.node import ToolError
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
from dtest import Tester, create_ks
from tools.jmxutils import (JolokiaAgent, enable_jmx_ssl, make_mbean)
diff --git a/json_test.py b/json_test.py
index 69b8b5a5..bfb6e313 100644
--- a/json_test.py
+++ b/json_test.py
@@ -7,7 +7,7 @@ import sys
import pytest
import logging
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
from ccmlib import common
from ccmlib.common import is_win
diff --git a/materialized_views_test.py b/materialized_views_test.py
index a6c58c1f..e6a5cc35 100644
--- a/materialized_views_test.py
+++ b/materialized_views_test.py
@@ -19,7 +19,7 @@ from cassandra.concurrent import execute_concurrent_with_args
from cassandra.cluster import Cluster
from cassandra.query import SimpleStatement
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
from dtest import Tester, get_ip_from_node, create_ks, mk_bman_path
from tools.assertions import (assert_all, assert_crc_check_chance_equal,
assert_invalid, assert_none, assert_one,
diff --git a/paging_test.py b/paging_test.py
index 971c7778..c2818eb8 100644
--- a/paging_test.py
+++ b/paging_test.py
@@ -5,7 +5,7 @@ import logging
from flaky import flaky
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
from cassandra import ConsistencyLevel as CL
from cassandra import InvalidRequest, ReadFailure, ReadTimeout
diff --git a/pending_range_test.py b/pending_range_test.py
index 1e545108..bd6a7298 100644
--- a/pending_range_test.py
+++ b/pending_range_test.py
@@ -9,7 +9,7 @@ from cassandra.query import SimpleStatement
from dtest import Tester, create_ks, mk_bman_path
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
logger = logging.getLogger(__name__)
diff --git a/pushed_notifications_test.py b/pushed_notifications_test.py
index 8b278ccf..b0d1b27a 100644
--- a/pushed_notifications_test.py
+++ b/pushed_notifications_test.py
@@ -3,7 +3,7 @@ import pytest
import logging
from datetime import datetime
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
from threading import Event
from cassandra import ConsistencyLevel as CL
diff --git a/read_repair_test.py b/read_repair_test.py
index 5a81e639..fe487a34 100644
--- a/read_repair_test.py
+++ b/read_repair_test.py
@@ -2,7 +2,7 @@ from contextlib import contextmanager
import glob
import os
import time
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
import pytest
import logging
diff --git a/repair_tests/deprecated_repair_test.py
b/repair_tests/deprecated_repair_test.py
index 2b0fc0e2..2dc8df1d 100644
--- a/repair_tests/deprecated_repair_test.py
+++ b/repair_tests/deprecated_repair_test.py
@@ -3,7 +3,7 @@ import logging
import os
import subprocess
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
from cassandra import ConsistencyLevel
from ccmlib.common import is_win
diff --git a/repair_tests/incremental_repair_test.py
b/repair_tests/incremental_repair_test.py
index d18b390d..b933137c 100644
--- a/repair_tests/incremental_repair_test.py
+++ b/repair_tests/incremental_repair_test.py
@@ -1,5 +1,5 @@
import time
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
import pytest
import re
diff --git a/replace_address_test.py b/replace_address_test.py
index 751f0b3f..23d50f9b 100644
--- a/replace_address_test.py
+++ b/replace_address_test.py
@@ -1,6 +1,6 @@
import os
import tempfile
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
import pytest
import logging
diff --git a/replication_test.py b/replication_test.py
index 7098afcd..90d0cc30 100644
--- a/replication_test.py
+++ b/replication_test.py
@@ -1,7 +1,7 @@
import os
import re
import time
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
import pytest
import logging
diff --git a/requirements.txt b/requirements.txt
index e2b28eb1..cf908965 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,7 +21,7 @@ iniconfig==1.1.1
lxml==5.1.0
mock==5.1.0
netifaces==0.11.0
-packaging==21.3
+packaging<21
parse==1.20.1
pluggy==1.0.0
psutil==5.9.8
diff --git a/secondary_indexes_test.py b/secondary_indexes_test.py
index 1e14d636..eee7a02c 100644
--- a/secondary_indexes_test.py
+++ b/secondary_indexes_test.py
@@ -3,7 +3,7 @@ import random
import re
import time
import uuid
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
import pytest
import logging
diff --git a/snapshot_test.py b/snapshot_test.py
index 2a72b98d..ba1b04f6 100644
--- a/snapshot_test.py
+++ b/snapshot_test.py
@@ -4,7 +4,7 @@ import os
import shutil
import subprocess
import time
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
import pytest
import logging
diff --git a/sstable_generation_loading_test.py
b/sstable_generation_loading_test.py
index 490d1254..7e9291d9 100644
--- a/sstable_generation_loading_test.py
+++ b/sstable_generation_loading_test.py
@@ -2,7 +2,7 @@ import os
import subprocess
import time
import distutils.dir_util
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
import pytest
import logging
diff --git a/topology_test.py b/topology_test.py
index e1b89082..81074e3e 100644
--- a/topology_test.py
+++ b/topology_test.py
@@ -1,6 +1,6 @@
import re
import time
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
import pytest
import logging
diff --git a/ttl_test.py b/ttl_test.py
index c7ee5d9a..5fc171ae 100644
--- a/ttl_test.py
+++ b/ttl_test.py
@@ -6,7 +6,7 @@ import pytest
import logging
from collections import OrderedDict
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
from cassandra import ConsistencyLevel, InvalidRequest
from cassandra.query import SimpleStatement
diff --git a/upgrade_tests/cql_tests.py b/upgrade_tests/cql_tests.py
index e8215859..2712ccc8 100644
--- a/upgrade_tests/cql_tests.py
+++ b/upgrade_tests/cql_tests.py
@@ -7,7 +7,7 @@ import pytest
import logging
from collections import OrderedDict
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
from uuid import UUID, uuid4
from cassandra import ConsistencyLevel, InvalidRequest
diff --git a/upgrade_tests/upgrade_base.py b/upgrade_tests/upgrade_base.py
index 6f5326d4..6b2f53ed 100644
--- a/upgrade_tests/upgrade_base.py
+++ b/upgrade_tests/upgrade_base.py
@@ -1,4 +1,4 @@
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
import logging
import pytest
diff --git a/upgrade_tests/upgrade_supercolumns_test.py
b/upgrade_tests/upgrade_supercolumns_test.py
index 6f6aad74..a4ed85b3 100644
--- a/upgrade_tests/upgrade_supercolumns_test.py
+++ b/upgrade_tests/upgrade_supercolumns_test.py
@@ -1,4 +1,4 @@
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
import os
import pytest
diff --git a/upgrade_tests/upgrade_through_versions_test.py
b/upgrade_tests/upgrade_through_versions_test.py
index b27a0a42..c9b79ed0 100644
--- a/upgrade_tests/upgrade_through_versions_test.py
+++ b/upgrade_tests/upgrade_through_versions_test.py
@@ -1,4 +1,4 @@
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
import logging
import operator
diff --git a/upgrade_tests/upgrade_udtfix_test.py
b/upgrade_tests/upgrade_udtfix_test.py
index dfb384cb..ea2eef3c 100644
--- a/upgrade_tests/upgrade_udtfix_test.py
+++ b/upgrade_tests/upgrade_udtfix_test.py
@@ -2,7 +2,7 @@ import pytest
import logging
from dtest import Tester
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
from tools.misc import add_skip
from .upgrade_manifest import build_upgrade_pairs, CASSANDRA_3_0,
RUN_STATIC_UPGRADE_MATRIX
diff --git a/user_functions_test.py b/user_functions_test.py
index d0676019..e1c25273 100644
--- a/user_functions_test.py
+++ b/user_functions_test.py
@@ -3,7 +3,7 @@ import time
import pytest
import logging
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
from cassandra import FunctionFailure
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
