use terminaltables3, migrate to pyproject.toml

build-artifacts.sh

@@ -1,17 +1,17 @@
 #!/bin/bash -xe
 
-PREV_DIR=`pwd`
+PREV_DIR=$(pwd)
 cd "$(dirname $0)"
 
 echo "Cleaning environment"
-python3 setup.py clean
+rm -rf ./build
 
 echo "Building chrome-loader.exe"
 rm -f bzt/resources/chrome-loader.exe
 x86_64-w64-mingw32-gcc -std=c99 -o bzt/resources/chrome-loader.exe bzt/resources/chrome-loader.c
 
 echo "Creating distribution packages"
 rm -rf ./dist
-python3 ./setup.py sdist bdist_wheel
+python3 -m build
 
 cd "${PREV_DIR}"

bzt/engine/dicts.py

@@ -271,7 +271,7 @@ def replace_infinities(value, key, container):
                 container[key] = str(container[key])
 
     def _replace_tabs(self, lines, fname):
-        has_tab_indents = re.compile("^( *)(\t+)( *\S*)")
+        has_tab_indents = re.compile(r"^( *)(\t+)( *\S*)")
         res = ""
         for num, line in enumerate(lines):
             replaced = has_tab_indents.sub(r"\1" + (" " * self.tab_replacement_spaces) + r"\3", line)

bzt/jmx/mqtt.py

@@ -5,7 +5,7 @@
 from lxml import etree
 
 
-COUNT_CHECK_CONTENT = """
+COUNT_CHECK_CONTENT = r"""
 String resp_message = prev.getResponseMessage();
 int target_count_min = %s
 def match = (resp_message =~ /Received (\d+) of message./);

bzt/jmx/rte.py

@@ -123,7 +123,7 @@ def _handle_input_notation(_input):
                 text = _input[key]
 
             elif re.match(r'\(.+?\)', key):
-                label = re.findall("\((.+?)\)", key)[0]
+                label = re.findall(r"\((.+?)\)", key)[0]
                 text = _input[key]
         return row, col, label, text, tabs
 

bzt/modules/ab.py

@@ -208,7 +208,7 @@ def __init__(self, config=None, **kwargs):
         super(ApacheBenchmark, self).__init__(tool_path=tool_path, installable=False, **kwargs)
 
     def _get_version(self, output):
-        version = re.findall("Version\s(\S+)\s", output)
+        version = re.findall(r"Version\s(\S+)\s", output)
         if not version:
             self.log.warning("%s tool version parsing error: %s", self.tool_name, output)
         else:

bzt/modules/blazemeter/cloud_provisioning.py

@@ -27,7 +27,7 @@
 from urllib.error import URLError
 
 import requests
-from terminaltables import SingleTable, AsciiTable
+from terminaltables3 import SingleTable, AsciiTable
 from urwid import Pile, Text
 
 from bzt import AutomatedShutdown, TaurusConfigError, TaurusException, TaurusNetworkError, NormalShutdown

bzt/modules/external.py

@@ -17,7 +17,7 @@ class ExternalResultsLoader(ScenarioExecutor, AggregatorListener):
     :type reader: bzt.modules.aggregator.ResultsReader
     """
     AB_HEADER = "starttime\tseconds\tctime\tdtime\tttime\twait"
-    PBENCH_FORMAT = re.compile("^[0-9]+\.[0-9]{3}\t[^\t]*\t([0-9]+\t){9}[0-9]+$")
+    PBENCH_FORMAT = re.compile(r"^[0-9]+\.[0-9]{3}\t[^\t]*\t([0-9]+\t){9}[0-9]+$")
 
     def __init__(self):
         super(ExternalResultsLoader, self).__init__()

bzt/modules/gatling.py

@@ -200,7 +200,7 @@ def _normalizeContent(self,dynamicExtractor,subject):
     @staticmethod
     def _safeEscape(subject):
         subject = re.escape(subject)
-        subject = subject.replace("\^","^").replace("\(","(").replace("\)",")").replace("\+","+").replace("\*","*").replace("\.",".").replace("\?","?").replace('"','\\"')
+        subject = subject.replace(r"\^","^").replace(r"\(","(").replace(r"\)",")").replace(r"\+","+").replace(r"\*","*").replace(r"\.",".").replace(r"\?","?").replace('"','\\"')
         return subject
 
     def _get_regex_extractor(self,varname, regexp, match_no,defaults=None):

bzt/modules/java/tools.py

@@ -53,7 +53,7 @@ def __init__(self, **kwargs):
         super(JavaC, self).__init__(tool_path="javac", installable=False, **kwargs)
 
     def _get_version(self, output):
-        versions = re.findall("javac\ ([\d\._]*)", output)
+        versions = re.findall(r"javac\ ([\d\._]*)", output)
         version = parse_java_version(versions)
 
         if not version:

bzt/modules/reporting.py

@@ -22,7 +22,7 @@
 from collections import Counter, OrderedDict
 from datetime import datetime
 
-from terminaltables import AsciiTable
+from terminaltables3 import AsciiTable
 
 from bzt import TaurusInternalException, TaurusConfigError
 from bzt.engine import Reporter

bzt/requests_model.py

@@ -21,7 +21,7 @@
 from bzt import TaurusConfigError, TaurusInternalException
 from bzt.utils import ensure_is_dict, dehumanize_time, BetterDict, parse_think_time
 
-VARIABLE_PATTERN = re.compile("\${.+\}")
+VARIABLE_PATTERN = re.compile(r"\${.+\}")
 
 
 def has_variable_pattern(val):

bzt/utils.py

@@ -175,9 +175,9 @@ def parse_java_version(versions):
         version = versions[0]
 
         if LooseVersion(version) > LooseVersion("6"):  # start of openjdk naming
-            major = re.findall("^([\d]*)", version)
+            major = re.findall(r"^([\d]*)", version)
         else:
-            major = re.findall("\.([\d]*)", version)
+            major = re.findall(r"\.([\d]*)", version)
 
         if major:
             return major[0]
@@ -1527,7 +1527,7 @@ def __init__(self, **kwargs):
         super(JavaVM, self).__init__(installable=False, tool_path="java", **kwargs)
 
     def _get_version(self, output):
-        versions = re.findall("version\ \"([_\d\.]*)", output)
+        versions = re.findall(r"version\ \"([_\d\.]*)", output)
         version = parse_java_version(versions)
 
         if not version:
@@ -1991,7 +1991,7 @@ def get_assembled_value(configs, key, protect=False):
 
 def parse_think_time(think_time, full=False):
     distributions = ["uniform", "gaussian", "poisson"]
-    format_str = "^(%s)\(([\wd.]+)[,\s]+([\wd.]+)\)$"
+    format_str = r"^(%s)\(([\wd.]+)[,\s]+([\wd.]+)\)$"
     expr = re.compile(format_str % '|'.join(distributions), re.IGNORECASE)
     res = expr.match(str(think_time))
 

pyproject.toml

@@ -0,0 +1,42 @@
+[project]
+name = "bzt"
+description = "Taurus Tool for Continuous Testing"
+readme = "README.md"
+authors = [{ name = "Andrey Pokhilko", email = "[email protected]" }]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Topic :: Software Development :: Quality Assurance",
+    "Topic :: Software Development :: Testing",
+    "Topic :: Software Development :: Testing :: Traffic Generation",
+    "License :: OSI Approved :: Apache Software License",
+    "Operating System :: Microsoft :: Windows",
+    "Operating System :: MacOS",
+    "Operating System :: POSIX :: Linux",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+]
+requires-python = ">=3.6" # should be '>=3.7', but let's keep it for obsolete configuration
+license = { text = "Apache 2.0" }
+dynamic = ["dependencies", "version"]
+
+[project.urls]
+Homepage = "http://gettaurus.org/"
+Downloads = "http://gettaurus.org/docs/DeveloperGuide/#Python-Egg-Snapshots"
+
+[project.scripts]
+bzt = "bzt.cli:main"
+jmx2yaml = "bzt.jmx2yaml:main"
+soapui2yaml = "bzt.soapui2yaml:main"
+swagger2yaml = "bzt.swagger2yaml:main"
+
+[tool.setuptools.dynamic]
+version = { attr = "bzt.resources.version.VERSION" }
+dependencies = { file = "requirements.txt" }
+
+[tool.setuptools.packages.find]
+include = ["bzt*"]
+
+[build-system]
+requires = ["setuptools>=68"]
+build-backend = "setuptools.build_meta"

requirements.txt

@@ -12,7 +12,7 @@ pyvirtualdisplay; sys_platform != 'win32'
 pyyaml
 requests>=2.18.1
 urwid==2.1.2
-terminaltables>=3.1.0
+terminaltables3>=4.0.0
 molotov!=2.3
 influxdb >= 5.3
 python-socketio>=5.8.0

tests/unit/modules/jmeter/test_JMX.py

@@ -199,7 +199,7 @@ def test_TST_low_val(self):
 
     def _get_tst_schedule(self):
         records = []
-        shaper_elements = self.jmx.get("kg\.apc\.jmeter\.timers\.VariableThroughputTimer")
+        shaper_elements = self.jmx.get(r"kg\.apc\.jmeter\.timers\.VariableThroughputTimer")
         self.assertEqual(1, len(shaper_elements))
 
         shaper_collection = shaper_elements[0].find(".//collectionProp[@name='load_profile']")

tests/unit/modules/jmeter/test_JMeterExecutor.py

@@ -115,7 +115,7 @@ def test_zero_concurrency(self):
         self.obj.prepare()
         jmx = JMX(self.obj.modified_jmx)
         selector = 'jmeterTestPlan>hashTree>hashTree>ThreadGroup'
-        selector += '>stringProp[name=ThreadGroup\.num_threads]'
+        selector += r'>stringProp[name=ThreadGroup\.num_threads]'
         thr = jmx.get(selector)
         self.assertEqual(4, len(thr))  # tg with concurrency=0 must be disabled
         self.assertEqual('20', thr[0].text)  # 2 -> 20
@@ -138,7 +138,7 @@ def test_jmx_2tg(self):
         self.obj.prepare()
         jmx = JMX(self.obj.modified_jmx)
         selector = 'jmeterTestPlan>hashTree>hashTree>ThreadGroup'
-        selector += '>stringProp[name=ThreadGroup\.num_threads]'
+        selector += r'>stringProp[name=ThreadGroup\.num_threads]'
         thr = jmx.get(selector)
         self.assertEquals('420', thr[0].text)
         self.assertEquals('631', thr[1].text)

tests/unit/modules/test_cloudProvisioning.py

@@ -2090,10 +2090,10 @@ def get_kpis(self, min_ts):
         return self._extract("GET https://a.blazemeter.com/api/v4/data/kpis")
 
     def get_aggregate_report(self):
-        return self._extract("GET https://a.blazemeter.com/api/v4/masters/\d+/reports/aggregatereport/data")
+        return self._extract(r"GET https://a.blazemeter.com/api/v4/masters/\d+/reports/aggregatereport/data")
 
     def get_errors(self):
-        tpl = "GET https://a.blazemeter.com/api/v4/masters/\d+/reports/errorsreport/data?noDataError=false"
+        tpl = r"GET https://a.blazemeter.com/api/v4/masters/\d+/reports/errorsreport/data?noDataError=false"
         return self._extract(tpl)
 
 

tests/unit/modules/test_locustIOExecutor.py

@@ -246,7 +246,7 @@ def test_build_script(self):
                         "body": {'var1': 'val1'},
                         "assert": [{
                             'subject': 'body',
-                            'contains': '\w+l1e'}]}]}}})
+                            'contains': r'\w+l1e'}]}]}}})
         self.obj_prepare()
         self.assertFilesEqual(RESOURCES_DIR + "locust/generated_from_requests.py", self.obj.script)
         self.obj.post_process()