From 94c44e622a36aa2889bd34959da82ae9889eb1ac Mon Sep 17 00:00:00 2001 From: Tim Theisen Date: Fri, 16 Jan 2026 10:59:41 -0600 Subject: [PATCH 1/2] HTCONDOR-3439-update-to-htcondor2 --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- htmap/cli.py | 2 +- htmap/condor.py | 2 +- htmap/htio.py | 2 +- htmap/mapping.py | 2 +- htmap/maps.py | 4 ++-- htmap/options.py | 2 +- htmap/run/_htmap_transfer_plugin.py | 4 ++-- htmap/state.py | 2 +- htmap/utils.py | 4 ++-- tests/ci.sh | 6 +++--- tests/integration/test_errors_and_holds.py | 2 +- tests/integration/test_late_materialization.py | 2 +- tests/integration/user_file_transfer/test_output_remaps.py | 2 +- .../user_file_transfer/test_url_output_transfer.py | 2 +- tests/unit/test_htio.py | 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 43ccd487..2d6b1bed 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -18,7 +18,7 @@ A clear and concise description of what you expected to happen. **Software Versions:** Include the results of running each of the following from the command line: -* `python -c "import htcondor, htmap; print(htcondor.version()); print(htmap.version())"` (can run the part in `"` directly inside Python if desired) +* `python -c "import htcondor2 as htcondor, htmap; print(htcondor.version()); print(htmap.version())"` (can run the part in `"` directly inside Python if desired) * `condor_version` * ` cat /etc/os-release` * `cat /proc/version` diff --git a/htmap/cli.py b/htmap/cli.py index ac1d58cb..1e1d255f 100644 --- a/htmap/cli.py +++ b/htmap/cli.py @@ -24,7 +24,7 @@ from typing import Collection, List, Optional, Tuple import click -import htcondor +import htcondor2 as htcondor from click_didyoumean import DYMGroup from halo import Halo from spinners import Spinners diff --git a/htmap/condor.py b/htmap/condor.py index 17691129..c217d5bc 100644 --- a/htmap/condor.py +++ b/htmap/condor.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import htcondor +import htcondor2 as htcondor from htmap import settings diff --git a/htmap/htio.py b/htmap/htio.py index 32eb68bb..0d437421 100644 --- a/htmap/htio.py +++ b/htmap/htio.py @@ -20,7 +20,7 @@ from typing import Any, Callable, Iterable, Iterator, List import cloudpickle -import htcondor +import htcondor2 as htcondor from . import names from .types import ARGS_AND_KWARGS diff --git a/htmap/mapping.py b/htmap/mapping.py index 8d62d48d..1e1c1867 100644 --- a/htmap/mapping.py +++ b/htmap/mapping.py @@ -21,7 +21,7 @@ from pprint import pformat from typing import Any, Callable, Dict, Iterable, Iterator, List, Optional, Tuple, Union -import htcondor +import htcondor2 as htcondor from . import condor, exceptions, htio, maps, names, options, settings, tags, transfer, utils from .types import ARGS, ARGS_AND_KWARGS, ARGS_OR_KWARGS, KWARGS diff --git a/htmap/maps.py b/htmap/maps.py index 6c3b723e..c86d4b29 100644 --- a/htmap/maps.py +++ b/htmap/maps.py @@ -26,8 +26,8 @@ from pathlib import Path from typing import Any, Dict, Iterable, Iterator, List, Mapping, MutableMapping, Optional, Tuple -import classad -import htcondor +import classad2 as classad +import htcondor2 as htcondor from tqdm import tqdm from . import condor, errors, exceptions, holds, htio, mapping, names, settings, state, tags, utils diff --git a/htmap/options.py b/htmap/options.py index cfe4f6ed..41d485bc 100644 --- a/htmap/options.py +++ b/htmap/options.py @@ -21,7 +21,7 @@ from pathlib import Path from typing import Callable, Dict, Iterable, List, Optional, Tuple, Union -import htcondor +import htcondor2 as htcondor from . import exceptions, names, settings, transfer, utils from .types import REMAPS, TRANSFER_PATH diff --git a/htmap/run/_htmap_transfer_plugin.py b/htmap/run/_htmap_transfer_plugin.py index 8633f8ae..40c028fa 100755 --- a/htmap/run/_htmap_transfer_plugin.py +++ b/htmap/run/_htmap_transfer_plugin.py @@ -8,8 +8,8 @@ import traceback from pathlib import Path -import classad -import htcondor +import classad2 as classad +import htcondor2 as htcondor TRANSFER_PLUGIN_CACHE = "_htmap_transfer_plugin_cache" USER_URL_TRANSFER_DIR = "_htmap_user_url_transfer" diff --git a/htmap/state.py b/htmap/state.py index 7a0c194e..52935cb7 100644 --- a/htmap/state.py +++ b/htmap/state.py @@ -21,7 +21,7 @@ from pathlib import Path from typing import Dict, List, Tuple -import htcondor +import htcondor2 as htcondor from . import exceptions, holds, names, utils diff --git a/htmap/utils.py b/htmap/utils.py index ee66ce7e..9169df8e 100644 --- a/htmap/utils.py +++ b/htmap/utils.py @@ -24,8 +24,8 @@ from pathlib import Path from typing import Any, Callable, Dict, Iterable, Mapping, MutableMapping, Optional, Tuple, Union -import htcondor -from classad import ClassAd +import htcondor2 as htcondor +from classad2 import ClassAd from . import exceptions diff --git a/tests/ci.sh b/tests/ci.sh index e288feee..b79c5215 100755 --- a/tests/ci.sh +++ b/tests/ci.sh @@ -10,16 +10,16 @@ condor_version echo echo "HTCondor Python bindings version:" -python -c "import htcondor; print(htcondor.version())" +python3 -c "import htcondor2 as htcondor; print(htcondor.version())" echo echo "pytest version:" -pytest --version +pytest-3 --version printf "\n-----\n" -pytest -n 4 --cov --durations=20 +pytest-3 -n 4 --cov --durations=20 coverage xml -o /tmp/coverage.xml codecov -X gcov -f /tmp/coverage.xml diff --git a/tests/integration/test_errors_and_holds.py b/tests/integration/test_errors_and_holds.py index 2ecb8832..0c5518b2 100644 --- a/tests/integration/test_errors_and_holds.py +++ b/tests/integration/test_errors_and_holds.py @@ -15,7 +15,7 @@ from pathlib import Path -import htcondor +import htcondor2 as htcondor import pytest import htmap diff --git a/tests/integration/test_late_materialization.py b/tests/integration/test_late_materialization.py index d8b402ee..c4cfa164 100644 --- a/tests/integration/test_late_materialization.py +++ b/tests/integration/test_late_materialization.py @@ -16,7 +16,7 @@ import time from pathlib import Path -import htcondor +import htcondor2 as htcondor import pytest import htmap diff --git a/tests/integration/user_file_transfer/test_output_remaps.py b/tests/integration/user_file_transfer/test_output_remaps.py index c9bcc5bc..422a279e 100644 --- a/tests/integration/user_file_transfer/test_output_remaps.py +++ b/tests/integration/user_file_transfer/test_output_remaps.py @@ -16,7 +16,7 @@ from pathlib import Path -import htcondor +import htcondor2 as htcondor import pytest import htmap diff --git a/tests/integration/user_file_transfer/test_url_output_transfer.py b/tests/integration/user_file_transfer/test_url_output_transfer.py index 46df62c1..c20b237c 100644 --- a/tests/integration/user_file_transfer/test_url_output_transfer.py +++ b/tests/integration/user_file_transfer/test_url_output_transfer.py @@ -16,7 +16,7 @@ from pathlib import Path -import htcondor +import htcondor2 as htcondor import pytest import htmap diff --git a/tests/unit/test_htio.py b/tests/unit/test_htio.py index 7cc78456..e3b19dfd 100644 --- a/tests/unit/test_htio.py +++ b/tests/unit/test_htio.py @@ -15,7 +15,7 @@ from pathlib import Path -import htcondor +import htcondor2 as htcondor import pytest from htmap import htio From 6550eeada6462aadeba877879a69d58eeca63cd3 Mon Sep 17 00:00:00 2001 From: Tim Theisen Date: Fri, 16 Jan 2026 11:17:02 -0600 Subject: [PATCH 2/2] HTCONDOR-3439: Update to cache v4 in github actions --- .github/workflows/pre-commit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 412e4203..eec0f283 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -18,7 +18,7 @@ jobs: - name: set PY run: | echo "PY=$(python -c 'import hashlib, sys;print(hashlib.sha256(sys.version.encode()+sys.executable.encode()).hexdigest())')" >> $GITHUB_ENV - - uses: actions/cache@v1 + - uses: actions/cache@v4 with: path: ~/.cache/pre-commit key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}