Skip to content
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: 3 additions & 3 deletions condor_tools/condor_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from dataclasses import dataclass
from typing import Optional

import htcondor
import htcondor2
from prettytable import PrettyTable
from termcolor import colored

Expand All @@ -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


Expand Down
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
[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"
requires-python = ">=3.9,<3.10"
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",
"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",
Expand Down
2 changes: 1 addition & 1 deletion tests/test_utilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
Loading