Skip to content

Added support for HTCondor v2 Python bindings #526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mambelli wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added support for HTCondor v2 Python bindings #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Fixed GCE billing.
### New features / functionalities

- Improved compatibility and separation with GlideinWMS Frontend
- Added HTCondor v2 Python binding support (PR #526)

### Changed defaults / behaviours

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies = [
"gcs-oauth2-boto-plugin >= 2.7",
"google-api-python-client >= 1.12.8",
"google_auth >= 1.16.0",
"htcondor >= 9.0.0, < 25.0.0",
"htcondor >= 9.0.0",
"numpy >= 1.19.5, < 2.0.0; python_version >= '3.7'",
"pandas >= 1.5.3, < 2.0.0; python_version >= '3.7'",
"pem",
Expand Down
5 changes: 4 additions & 1 deletion src/decisionengine_modules/htcondor/htcondor_query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
import os
import sys

import htcondor
try:
import htcondor # pylint: disable=import-error
except ImportError:
import htcondor2 as htcondor # pylint: disable=import-error


class QueryError(RuntimeError):
Expand Down
10 changes: 8 additions & 2 deletions src/decisionengine_modules/htcondor/publishers/publisher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,20 @@

from functools import partial

import classad
import htcondor
import pandas

from decisionengine.framework.modules import Publisher
from decisionengine.framework.modules.Publisher import Parameter
from decisionengine_modules.util.retry_function import retry_wrapper

try:
import classad # pylint: disable=import-error
import htcondor # pylint: disable=import-error
except ImportError:
import classad2 as classad # pylint: disable=import-error
import htcondor2 as htcondor # pylint: disable=import-error


DEFAULT_UPDATE_AD_COMMAND = "UPDATE_AD_GENERIC"
DEFAULT_INVALIDATE_AD_COMMAND = "INVALIDATE_ADS_GENERIC"

Expand Down
5 changes: 4 additions & 1 deletion src/decisionengine_modules/util/testutils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@
import datetime # noqa: F401

# These imports needed for the `eval` blocks
from classad import classad # noqa: F401
try:
from classad import classad # noqa: F401 # pylint: disable=import-error

Check notice

Code scanning / CodeQL

Unused import Note test

Import of 'classad' is not used.
except ImportError:
from classad2 import classad # noqa: F401 # pylint: disable=import-error

Check notice

Code scanning / CodeQL

Unused import Note test

Import of 'classad' is not used.


def input_from_file(fname):
with open(fname) as fd:
return eval(fd.read())
Loading