HTCONDOR-3439-update-to-htcondor2

.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`

.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') }}

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

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
 

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

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

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

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

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"

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
 

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
 

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

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

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

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

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

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