From ec8ddd16f404ac2a7bc4e1998f904de566f5a478 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2026 13:28:38 +0000 Subject: [PATCH 1/4] Bump pygments from 2.19.2 to 2.20.0 Bumps [pygments](https://github.com/pygments/pygments) from 2.19.2 to 2.20.0. - [Release notes](https://github.com/pygments/pygments/releases) - [Changelog](https://github.com/pygments/pygments/blob/master/CHANGES) - [Commits](https://github.com/pygments/pygments/compare/2.19.2...2.20.0) --- updated-dependencies: - dependency-name: pygments dependency-version: 2.20.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d75cfbe..e92457b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ dependencies = [ "pluggy==1.6.0", "prettytable==3.11.0", "pyfakefs==5.9.2", - "Pygments==2.19.2", + "Pygments==2.20.0", "pytest==8.4.1", "pytest-cov==6.2.1", "pytest-mock==3.14.1", From 27ad233dcf97095af862ec7f1729e2cfdd272c48 Mon Sep 17 00:00:00 2001 From: Tom Runting Date: Tue, 31 Mar 2026 14:37:20 +0100 Subject: [PATCH 2/4] Bump htcondor --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e92457b..bd43871 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ authors = [{name = "Tom Runting", email = "thomas.runting@cern.ch"}] dependencies = [ "coverage==7.10.3", "exceptiongroup==1.3.0", - "htcondor==24.0.11", + "htcondor==25.0.8", "iniconfig==2.1.0", "packaging==25.0", "pluggy==1.6.0", From 0f79e1f333e6b7cd6656b98c61b7b5eaafbb5954 Mon Sep 17 00:00:00 2001 From: Tom Runting Date: Tue, 31 Mar 2026 14:38:17 +0100 Subject: [PATCH 3/4] Bump package version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index bd43871..c678c80 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "condor_tools" -version = "1.1.2" +version = "1.1.3" description = "A collection of tools for working with Condor jobs and data." requires-python = "==3.9.21" authors = [{name = "Tom Runting", email = "thomas.runting@cern.ch"}] From e4446400c346ed7cfb1a16b3e8743ff052a95fcd Mon Sep 17 00:00:00 2001 From: Tom Runting Date: Tue, 31 Mar 2026 14:57:59 +0100 Subject: [PATCH 4/4] Switch to htcondor2 API --- condor_tools/condor_tools.py | 6 +++--- pyproject.toml | 2 +- tests/test_utilities.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/condor_tools/condor_tools.py b/condor_tools/condor_tools.py index fcd3882..08675ce 100644 --- a/condor_tools/condor_tools.py +++ b/condor_tools/condor_tools.py @@ -10,7 +10,7 @@ from dataclasses import dataclass from typing import Optional -import htcondor +import htcondor2 from prettytable import PrettyTable from termcolor import colored @@ -35,8 +35,8 @@ def format(self, record): def _setup_condor() -> tuple: # Initialize the Collector and Schedd - collector = htcondor.Collector() - schedd = htcondor.Schedd() + collector = htcondor2.Collector() + schedd = htcondor2.Schedd() return collector, schedd diff --git a/pyproject.toml b/pyproject.toml index c678c80..8f1d3a7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ name = "condor_tools" version = "1.1.3" description = "A collection of tools for working with Condor jobs and data." -requires-python = "==3.9.21" +requires-python = ">=3.9,<3.10" authors = [{name = "Tom Runting", email = "thomas.runting@cern.ch"}] dependencies = [ diff --git a/tests/test_utilities.py b/tests/test_utilities.py index 37972a4..f2881c4 100644 --- a/tests/test_utilities.py +++ b/tests/test_utilities.py @@ -55,7 +55,7 @@ def mock_subprocess_run(cmd, *args, **kwargs): class TestCondorSetup: def test_setup_condor(self): - with patch("htcondor.Schedd", return_value=MagicMock()) as mock_schedd: + with patch("htcondor2.Schedd", return_value=MagicMock()) as mock_schedd: _setup_condor() mock_schedd.assert_called_once()