From 320445fd871160011eee5e8f317788386a920c6a Mon Sep 17 00:00:00 2001 From: Rcatala18 Date: Thu, 29 Oct 2026 13:29:03 +0100 Subject: [PATCH 1/5] upgrade pyproject --- pyproject.toml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 2eb8c68b..c275cf07 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,7 +30,6 @@ classifiers = [ "Intended Audience :: Other Audience", "Natural Language :: English", "Operating System :: OS Independent", - "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", @@ -43,7 +42,7 @@ classifiers = [ "Topic :: Software Development :: Testing :: BDD", "Topic :: Text Processing :: Linguistic", ] -requires-python = ">=3.10" +requires-python = ">=3.11" [project.urls] Homepage = "https://github.com/telefonica/toolium" @@ -105,7 +104,7 @@ exclude_lines = [ [tool.ruff] line-length = 120 -target-version = "py310" +target-version = "py311" [tool.ruff.lint] # Rules to enforce From 91cc61438dc2274b9c66924aea607f309d224366 Mon Sep 17 00:00:00 2001 From: Rcatala18 Date: Thu, 29 Oct 2026 13:29:14 +0100 Subject: [PATCH 2/5] update the readme --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 50b9105a..871d5ea8 100644 --- a/README.rst +++ b/README.rst @@ -20,7 +20,7 @@ Getting Started --------------- Run ``pip install toolium`` to install the latest version from `PyPi `_. It's -highly recommended to use a virtualenv. +highly recommended to use a virtualenv. Toolium requires Python 3.11 or later. The main dependencies are: From 1b44c957322b8522816948a9f2f9afcd2d335890 Mon Sep 17 00:00:00 2001 From: Rcatala18 Date: Thu, 29 Oct 2026 13:29:46 +0100 Subject: [PATCH 3/5] update 'datetime.timezone.utc' by 'datetime.UTC' --- .../test/utils/test_dataset_replace_param.py | 52 +++++++++---------- toolium/test_cases.py | 15 +----- toolium/utils/dataset.py | 10 ++-- 3 files changed, 33 insertions(+), 44 deletions(-) diff --git a/toolium/test/utils/test_dataset_replace_param.py b/toolium/test/utils/test_dataset_replace_param.py index 8f9afdec..1bb5b199 100644 --- a/toolium/test/utils/test_dataset_replace_param.py +++ b/toolium/test/utils/test_dataset_replace_param.py @@ -182,48 +182,48 @@ def test_replace_param_datetime_language_ignored(): def test_replace_param_today_spanish(): param = replace_param('[TODAY]', language='es') - assert param == datetime.datetime.now(datetime.timezone.utc).strftime('%d/%m/%Y') + assert param == datetime.datetime.now(datetime.UTC).strftime('%d/%m/%Y') def test_replace_param_today_not_spanish(): param = replace_param('[TODAY]', language='en') - assert param == datetime.datetime.now(datetime.timezone.utc).strftime('%Y/%m/%d') + assert param == datetime.datetime.now(datetime.UTC).strftime('%Y/%m/%d') def test_replace_param_today_offset(): param = replace_param('[TODAY - 1 DAYS]', language='es') assert param == datetime.datetime.strftime( - datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(days=1), + datetime.datetime.now(datetime.UTC) - datetime.timedelta(days=1), '%d/%m/%Y', ) def test_replace_param_now_spanish(): param = replace_param('[NOW]', language='es') - assert param == datetime.datetime.now(datetime.timezone.utc).strftime('%d/%m/%Y %H:%M:%S') + assert param == datetime.datetime.now(datetime.UTC).strftime('%d/%m/%Y %H:%M:%S') def test_replace_param_now_not_spanish(): param = replace_param('[NOW]', language='it') - assert param == datetime.datetime.now(datetime.timezone.utc).strftime('%Y/%m/%d %H:%M:%S') + assert param == datetime.datetime.now(datetime.UTC).strftime('%Y/%m/%d %H:%M:%S') def test_replace_param_now_with_format(): param = replace_param('[NOW(%Y-%m-%dT%H:%M:%SZ)]') - assert param == datetime.datetime.now(datetime.timezone.utc).strftime('%Y-%m-%dT%H:%M:%SZ') + assert param == datetime.datetime.now(datetime.UTC).strftime('%Y-%m-%dT%H:%M:%SZ') def test_replace_param_now_with_format_and_decimals_limit(): param = replace_param('[NOW(%Y-%m-%dT%H:%M:%S.%3fZ)]') param_till_dot = param[: param.find('.')] - assert param_till_dot == datetime.datetime.now(datetime.timezone.utc).strftime('%Y-%m-%dT%H:%M:%S') + assert param_till_dot == datetime.datetime.now(datetime.UTC).strftime('%Y-%m-%dT%H:%M:%S') assert re.match(param_till_dot + r'\.\d{3}Z', param) def test_replace_param_now_with_format_and_decimals_limit_beyond_microseconds(): param = replace_param('[NOW(%Y-%m-%dT%H:%M:%S.%12fZ)]') param_till_dot = param[: param.find('.')] - assert param_till_dot == datetime.datetime.now(datetime.timezone.utc).strftime('%Y-%m-%dT%H:%M:%S') + assert param_till_dot == datetime.datetime.now(datetime.UTC).strftime('%Y-%m-%dT%H:%M:%S') assert re.match(param_till_dot + r'\.\d{12}Z', param) @@ -240,7 +240,7 @@ def test_not_replace_param_now_with_invalid_closing_parenthesis_in_format(): def test_replace_param_now_offset(): param = replace_param('[NOW + 5 MINUTES]', language='es') assert param == datetime.datetime.strftime( - datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(minutes=5), + datetime.datetime.now(datetime.UTC) + datetime.timedelta(minutes=5), '%d/%m/%Y %H:%M:%S', ) @@ -248,7 +248,7 @@ def test_replace_param_now_offset(): def test_replace_param_now_offset_with_format(): param = replace_param('[NOW(%Y-%m-%dT%H:%M:%SZ) + 5 MINUTES]') assert param == datetime.datetime.strftime( - datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(minutes=5), + datetime.datetime.now(datetime.UTC) + datetime.timedelta(minutes=5), '%Y-%m-%dT%H:%M:%SZ', ) @@ -256,7 +256,7 @@ def test_replace_param_now_offset_with_format(): def test_replace_param_today_offset_and_more(): param = replace_param('The day [TODAY - 1 DAYS] was yesterday', language='es') offset_date = datetime.datetime.strftime( - datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(days=1), + datetime.datetime.now(datetime.UTC) - datetime.timedelta(days=1), '%d/%m/%Y', ) assert param == f'The day {offset_date} was yesterday' @@ -265,7 +265,7 @@ def test_replace_param_today_offset_and_more(): def test_replace_param_today_offset_and_more_not_spanish(): param = replace_param('The day [TODAY - 1 DAYS] was yesterday', language='it') offset_date = datetime.datetime.strftime( - datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(days=1), + datetime.datetime.now(datetime.UTC) - datetime.timedelta(days=1), '%Y/%m/%d', ) assert param == f'The day {offset_date} was yesterday' @@ -274,7 +274,7 @@ def test_replace_param_today_offset_and_more_not_spanish(): def test_replace_param_now_offset_and_more(): param = replace_param('I will arrive at [NOW + 10 MINUTES] tomorrow', language='es') offset_datetime = datetime.datetime.strftime( - datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(minutes=10), + datetime.datetime.now(datetime.UTC) + datetime.timedelta(minutes=10), '%d/%m/%Y %H:%M:%S', ) assert param == f'I will arrive at {offset_datetime} tomorrow' @@ -283,7 +283,7 @@ def test_replace_param_now_offset_and_more(): def test_replace_param_now_offset_and_more_not_spanish(): param = replace_param('I will arrive at [NOW + 10 MINUTES] tomorrow', language='it') offset_datetime = datetime.datetime.strftime( - datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(minutes=10), + datetime.datetime.now(datetime.UTC) + datetime.timedelta(minutes=10), '%Y/%m/%d %H:%M:%S', ) assert param == f'I will arrive at {offset_datetime} tomorrow' @@ -292,7 +292,7 @@ def test_replace_param_now_offset_and_more_not_spanish(): def test_replace_param_now_offset_with_format_and_more(): param = replace_param('I will arrive at [NOW(%Y-%m-%dT%H:%M:%SZ) + 10 MINUTES] tomorrow') offset_datetime = datetime.datetime.strftime( - datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(minutes=10), + datetime.datetime.now(datetime.UTC) + datetime.timedelta(minutes=10), '%Y-%m-%dT%H:%M:%SZ', ) assert param == f'I will arrive at {offset_datetime} tomorrow' @@ -301,7 +301,7 @@ def test_replace_param_now_offset_with_format_and_more(): def test_replace_param_now_offset_with_format_and_more_language_is_irrelevant(): param = replace_param('I will arrive at [NOW(%Y-%m-%dT%H:%M:%SZ) + 10 MINUTES] tomorrow', language='ru') offset_datetime = datetime.datetime.strftime( - datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(minutes=10), + datetime.datetime.now(datetime.UTC) + datetime.timedelta(minutes=10), '%Y-%m-%dT%H:%M:%SZ', ) assert param == f'I will arrive at {offset_datetime} tomorrow' @@ -310,7 +310,7 @@ def test_replace_param_now_offset_with_format_and_more_language_is_irrelevant(): def test_replace_param_today_offset_with_format_and_more_with_extra_spaces(): param = replace_param('The date [NOW(%Y-%m-%dT%H:%M:%SZ) - 1 DAYS ] was yesterday') offset_date = datetime.datetime.strftime( - datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(days=1), + datetime.datetime.now(datetime.UTC) - datetime.timedelta(days=1), '%Y-%m-%dT%H:%M:%SZ', ) assert param == f'The date {offset_date} was yesterday' @@ -319,7 +319,7 @@ def test_replace_param_today_offset_with_format_and_more_with_extra_spaces(): def test_replace_param_today_offset_and_more_with_extra_spaces(): param = replace_param('The day [TODAY - 1 DAYS ] was yesterday', language='es') offset_date = datetime.datetime.strftime( - datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(days=1), + datetime.datetime.now(datetime.UTC) - datetime.timedelta(days=1), '%d/%m/%Y', ) assert param == f'The day {offset_date} was yesterday' @@ -328,7 +328,7 @@ def test_replace_param_today_offset_and_more_with_extra_spaces(): def test_replace_param_today_offset_and_more_at_the_end(): param = replace_param('Yesterday was [TODAY - 1 DAYS]', language='es') offset_date = datetime.datetime.strftime( - datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(days=1), + datetime.datetime.now(datetime.UTC) - datetime.timedelta(days=1), '%d/%m/%Y', ) assert param == f'Yesterday was {offset_date}' @@ -337,7 +337,7 @@ def test_replace_param_today_offset_and_more_at_the_end(): def test_replace_param_today_offset_and_more_at_the_beginning(): param = replace_param('[TODAY - 1 DAYS] is yesterday', language='es') offset_date = datetime.datetime.strftime( - datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(days=1), + datetime.datetime.now(datetime.UTC) - datetime.timedelta(days=1), '%d/%m/%Y', ) assert param == f'{offset_date} is yesterday' @@ -349,11 +349,11 @@ def test_replace_param_today_offsets_and_more(): language='es', ) offset_date = datetime.datetime.strftime( - datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(days=1), + datetime.datetime.now(datetime.UTC) - datetime.timedelta(days=1), '%d/%m/%Y', ) offset_datetime = datetime.datetime.strftime( - datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(minutes=10), + datetime.datetime.now(datetime.UTC) + datetime.timedelta(minutes=10), '%d/%m/%Y %H:%M:%S', ) assert param == f'The day {offset_date} was yesterday and I have an appointment at {offset_datetime}' @@ -365,11 +365,11 @@ def test_replace_param_now_offsets_with_format_and_more(): 'and I have an appointment at [NOW(%Y-%m-%dT%H:%M:%SZ) + 10 MINUTES]', ) offset_date = datetime.datetime.strftime( - datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(days=1), + datetime.datetime.now(datetime.UTC) - datetime.timedelta(days=1), '%Y-%m-%dT%H:%M:%SZ', ) offset_datetime = datetime.datetime.strftime( - datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(minutes=10), + datetime.datetime.now(datetime.UTC) + datetime.timedelta(minutes=10), '%Y-%m-%dT%H:%M:%SZ', ) assert param == f'The date {offset_date} was yesterday and I have an appointment at {offset_datetime}' @@ -381,11 +381,11 @@ def test_replace_param_now_offsets_with_and_without_format_and_more(): language='es', ) offset_date = datetime.datetime.strftime( - datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(days=1), + datetime.datetime.now(datetime.UTC) - datetime.timedelta(days=1), '%Y-%m-%dT%H:%M:%SZ', ) offset_datetime = datetime.datetime.strftime( - datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(minutes=10), + datetime.datetime.now(datetime.UTC) + datetime.timedelta(minutes=10), '%d/%m/%Y %H:%M:%S', ) assert param == f'The date {offset_date} was yesterday and I have an appointment at {offset_datetime}' diff --git a/toolium/test_cases.py b/toolium/test_cases.py index 9ebfea9c..93f67a62 100644 --- a/toolium/test_cases.py +++ b/toolium/test_cases.py @@ -18,7 +18,7 @@ import logging import unittest -from toolium.config_driver import get_error_message_from_exception, get_error_message_from_traceback +from toolium.config_driver import get_error_message_from_traceback from toolium.config_files import ConfigFiles from toolium.driver_wrappers_pool import DriverWrappersPool from toolium.jira import change_all_jira_status @@ -65,18 +65,7 @@ def setUp(self): def tearDown(self): # Get error message from unittest errors error_message = '' - if hasattr(self._outcome, 'errors') and len(self._outcome.errors) > 0: - # Python <3.11 - exception_info = self._outcome.errors[-1][1] - if exception_info: - exception = exception_info[1] - error_message = get_error_message_from_exception(exception) - elif ( - not hasattr(self._outcome, 'errors') - and hasattr(self._outcome.result, 'failures') - and len(self._outcome.result.failures) > 0 - ): - # Python >=3.11 + if hasattr(self._outcome.result, 'failures') and len(self._outcome.result.failures) > 0: traceback = self._outcome.result.failures[0][1] error_message = get_error_message_from_traceback(traceback) diff --git a/toolium/utils/dataset.py b/toolium/utils/dataset.py index 01a243bf..5d163ec0 100644 --- a/toolium/utils/dataset.py +++ b/toolium/utils/dataset.py @@ -203,10 +203,10 @@ def _replace_param_replacement(param, language): # make sure random is not made up of digits only, by forcing the first char to be a letter '[RANDOM]': ''.join([r.choice(string.ascii_lowercase), *(r.choice(alphanums) for i in range(7))]), '[RANDOM_PHONE_NUMBER]': _get_random_phone_number, - '[TIMESTAMP]': str(int(datetime.datetime.timestamp(datetime.datetime.now(datetime.timezone.utc)))), - '[DATETIME]': str(datetime.datetime.now(datetime.timezone.utc).strftime(datetime_format)), - '[NOW]': str(datetime.datetime.now(datetime.timezone.utc).strftime(date_format)), - '[TODAY]': str(datetime.datetime.now(datetime.timezone.utc).strftime(date_day_format)), + '[TIMESTAMP]': str(int(datetime.datetime.timestamp(datetime.datetime.now(datetime.UTC)))), + '[DATETIME]': str(datetime.datetime.now(datetime.UTC).strftime(datetime_format)), + '[NOW]': str(datetime.datetime.now(datetime.UTC).strftime(date_format)), + '[TODAY]': str(datetime.datetime.now(datetime.UTC).strftime(date_day_format)), r'\[ROUND:(.*?)::(\d*)\]': _get_rounded_float_number, '[SHARP]': '#', } @@ -348,7 +348,7 @@ def _date_matcher(): return re.match(r'\[(NOW(?:\((?:.*)\)|)|TODAY)(?:\s*([\+|-]\s*\d+)\s*(\w+)\s*)?\]', param) def _offset_datetime(amount, units): - now = datetime.datetime.now(datetime.timezone.utc) + now = datetime.datetime.now(datetime.UTC) if not amount or not units: return now the_amount = int(amount.replace(' ', '')) From 2ecacf3df98d1d10ac291e35a9aaa1d8b370fd2c Mon Sep 17 00:00:00 2001 From: Rcatala18 Date: Thu, 29 Oct 2026 13:30:05 +0100 Subject: [PATCH 4/5] add feature to the version 3.8.5 --- CHANGELOG.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index bf6d8e76..3274a478 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,6 +7,7 @@ v3.8.5 *Release date: In development* - Add support for Python 3.14 +- Remove Python 3.10 support (Python 3.10 reaches end of life in October 2026) v3.8.4 ------ From be74a5dd5f63427c9ebab432ed5328d353b45a92 Mon Sep 17 00:00:00 2001 From: Rcatala18 Date: Thu, 29 Oct 2026 13:30:15 +0100 Subject: [PATCH 5/5] update the ci tests --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 38372a3b..20403a7e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: - name: Set supported python versions id: set-versions run: | - echo 'versions=["3.10", "3.11", "3.12", "3.13", "3.14"]' >> "$GITHUB_OUTPUT" + echo 'versions=["3.11", "3.12", "3.13", "3.14"]' >> "$GITHUB_OUTPUT" lint: runs-on: ubuntu-latest