htcondor 25.1.0__cp311-cp311-manylinux_2_28_aarch64.whl → 25.2.1__cp311-cp311-manylinux_2_28_aarch64.whl

{htcondor-25.1.0.dist-info → htcondor-25.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: htcondor
-Version: 25.1.0
+Version: 25.2.1
 Summary: HTCondor Python bindings
 Home-page: http://htcondor.org/
 Author: The HTCondor Project

{htcondor-25.1.0.dist-info → htcondor-25.2.1.dist-info}/RECORD

@@ -3,19 +3,19 @@ classad2/_class_ad.py,sha256=-C1hW5NRkg0GwBHGqrPp73yvRXrw4WCeh8RfYqeu5yw,15235
 classad2/_expr_tree.py,sha256=DckBEItpSdBkyX38Oa-_z0yBEsg7GbOHP6W4yWMsTTI,4700
 classad2/_parser_type.py,sha256=AfiZZ-pRoxLC6DJRmVA2ttI9pX5UhiCDJtt_6UTmH1E,654
 classad2/_value.py,sha256=R5skf2GIXLoqa8ngeZOWqzUnwwbe_uLHvRVY5kOTHSs,219
-classad2/classad2_impl.abi3.so,sha256=LkWMwx1nJc2EYoNoUmaJylqvT5qYY0gHc7sAao56WdM,1454737
+classad2/classad2_impl.abi3.so,sha256=faZMBUWCX6GkXzbjrH5Wjy6C6EsfoPEIoQn9wGr4fng,1455305
 classad3/ClassAd.py,sha256=c3i86QEcQcLPbF6gB8Yo4U19nRFy7xf_5wilAAfuLtg,8235
 classad3/Expression.py,sha256=_Gj9VaBE9Iq-91ROpOmxYaE-VrDOAzs9g34lIP1Fs3g,3584
 classad3/__init__.py,sha256=kHH3eWogIUG_jpRXHwWvJGZ3zAPvrZk8Tl8bBAhEEY8,1570
-htcondor.libs/libSciTokens-d5b98c44.so.0.0.2,sha256=CdEKBQeQGlVya2ZvgdMKbhOAZn5oF97rdS8B4yF50JM,399721
+htcondor.libs/libSciTokens-d5b98c44.so.0.0.2,sha256=OkT53stJN7LuNEtyyHm6rybIfTFzIRzBy5xcLRGO7FM,399721
 htcondor.libs/libbrotlicommon-b6e6c8bd.so.1.0.6,sha256=_B5anwC4bzb29Shq_l8USYARGAtrW1EUwebby8caUyM,197553
 htcondor.libs/libbrotlidec-5094ef0a.so.1.0.6,sha256=RM1YVlg7wchTccHvzrUwubok1CkZTM53CRw7T2Ov6yo,198281
-htcondor.libs/libclassad-fceb76cf.so.25.1.0,sha256=KG_eZgWWrwEve0N6DXqQwiNuCELlIisqEkA_BvxNlYs,16921985
+htcondor.libs/libclassad-bf0400d6.so.25.2.1,sha256=QKnN13beA989pZRu_SBok4Mivpz-qDveHzaekNQLlDc,16922273
 htcondor.libs/libcom_err-4b53f6ce.so.2.1,sha256=GdtF3jgePZjotDUKVW8JdbXuc-fr39R6YIINsvX8qWY,132169
-htcondor.libs/libcondor_utils_25_1_0-bc863910.so,sha256=YnxbV2aLgsSWgbX28vkKdTnGFjZmZpynynO0LMpVbk8,131759329
+htcondor.libs/libcondor_utils_25_2_1-84237ac3.so,sha256=fk74E0WVmOQ1UD6jCF0o7sEekUbEyId1jcTbCMZWyVA,132219729
 htcondor.libs/libcrypt-258f54d5.so.1.1.0,sha256=mA1Hga6a2NGy9gvlLPu_F20yzGLs-IiSDzR-mVdjbuI,198433
 htcondor.libs/libcrypto-3dc39733.so.1.1.1k,sha256=_iompPH3TAPEsA4B85pYGztLxEt3RLDKE13q56BlyyM,2945609
-htcondor.libs/libcurl-37295c13.so.4.5.0,sha256=q6Nmr7uq5632vPsBOJpjnCp-ACq_TM9EiOF6gG_AH6g,730537
+htcondor.libs/libcurl-723d0589.so.4.5.0,sha256=K1Qg-Hwy_DZs3RjOLdTl9y-n0kEGdoiYRpCJU-vKtcA,730537
 htcondor.libs/libgomp-a49a47f9.so.1.0.0,sha256=Q2Qt8EvfIPm0Ei0zbvPi5qSGxTbmFBWawOmBqQHVRTc,343345
 htcondor.libs/libgssapi_krb5-fe951f80.so.2.2,sha256=kQ1dHklTpLYm8TOCKr-6nsZhCDhkMcWUnSa8MtmcJk4,468689
 htcondor.libs/libidn2-1b2a13b7.so.0.3.6,sha256=EcpHyoq5qwMwcuinaXlv9_SCkTF_ydaO3wt7VPftphs,265025
@@ -64,7 +64,7 @@ htcondor2/_negotiator.py,sha256=ZmbYJSJgcy0r1nwuPT7FKWiHztwwVVcbAAIHay0wRSI,8221
 htcondor2/_param.py,sha256=hTrGFxuNbqW0BQ9AuoWNCzNsezblAJAR3iNt0TYk7PA,1018
 htcondor2/_query_opt.py,sha256=_qi5tU-7YFdS7iIYBP1-kCAQzJoap1rE0WZikgIiIJ8,1249
 htcondor2/_remote_param.py,sha256=c0t_oJhWK0GsT_PVhQp4hhEx5B6SsmEfT2dZ08n2aTQ,2745
-htcondor2/_schedd.py,sha256=8kcbOdykbAWPSi6Hc5XYiMwf0RLeDT3W_hdOi-FC-ZQ,34955
+htcondor2/_schedd.py,sha256=g3CKOQyDngWj39neHOWNoLmxlT6rAEDOy0qruNDWJOE,41730
 htcondor2/_security_context.py,sha256=UkhzTMPb2B9gcACiQEw9aHVOS7Lv1xnSXKi2WpOeTKc,692
 htcondor2/_startd.py,sha256=OqGtV3bv80WCasBoAp--J9ZkG5uHlZr6Q1fCHEscjMc,6063
 htcondor2/_submit.py,sha256=5OrJfrSi-2uk4LvgJCoPsuNRzB-_e28a73gHekrK2s8,16724
@@ -72,8 +72,8 @@ htcondor2/_submit_method.py,sha256=B_lmrg-sAu6r_cLOFsaRXGowQr0Vje492otq1tAPNhQ,7
 htcondor2/_submit_result.py,sha256=IV6SQeGpp0tXubSra8n69LN84yYDVKUZR8gHVbWmmkg,1710
 htcondor2/_subsystem_type.py,sha256=E0aq5aIDxYQ-SVbUsXJo7-CcVhV2KGkhCHGs7ydPnek,872
 htcondor2/_transaction_flag.py,sha256=JEFIs0hUa_t5pGYFHvJhGJW7xvQLvksdfjUelnY0Y2E,1129
-htcondor2/htcondor2_impl.abi3.so,sha256=-zwiKmT4o88zpX_xq53o_U4FJ2wYO6vsN3OI6aOmcmI,4414881
-htcondor2/personal.py,sha256=BNdyyxufaO3zhHmap00bLLkWJBI1EGfaI1o1hKAfJGk,25418
+htcondor2/htcondor2_impl.abi3.so,sha256=ik-ETw5ZAkcIodJ2e3lTBxWoitQ-Y6-5U_8aouopm9A,4481033
+htcondor2/personal.py,sha256=-Ae6JLvYJTwQIMsSngy_hQnjJkew3shgu8CsXHh1FGc,25464
 htcondor2/_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 htcondor2/_utils/ansi.py,sha256=cmL0GeEJ35BvGeVtfvFA7bI6Kk5s8OKajKPUPtHYMZ4,4243
 htcondor2/_utils/keyboard.py,sha256=jcI0fNIxNGwi91DvZOfN2e3fNzdDZPiudBSiOa3wF54,3289
@@ -89,7 +89,7 @@ htcondor2/dags/walk_order.py,sha256=nKRNwDZ2cTSlCsVXmRjStoSecgpuD8v2M9LgY8BNlrY,
 htcondor2/dags/writer.py,sha256=O388tmu-gUyd9jyyhCUpXB9hx68tvO7u_oAeQdSdfCU,12167
 htcondor2/htchirp/__init__.py,sha256=4u5l9a7xMB3CJtjThQ-maXXt5l4hN8AagCpqfO_UKxg,729
 htcondor2/htchirp/htchirp.py,sha256=xiKXhmzuftf69-_FMV0SYdg45lX97cJDChRFghglZ6k,50482
-htcondor-25.1.0.dist-info/METADATA,sha256=55GlUQfeqKhi5ODKVKL9bmK3sKeD4AZ1ws14Z4s4lTU,1592
-htcondor-25.1.0.dist-info/WHEEL,sha256=8jTxASeLvPr09PZ22DGSMQlRkrmgeqGaotjla49xWxo,114
-htcondor-25.1.0.dist-info/top_level.txt,sha256=v4Qf76MjPw5Ld-EyM6v3J6nSJDLUr3XGMf-HiXKegK0,78
-htcondor-25.1.0.dist-info/RECORD,,
+htcondor-25.2.1.dist-info/METADATA,sha256=eKg0oJnnHC9jSCy9cZxlKUYwgnJEvIVJEB8DkoLUcDE,1592
+htcondor-25.2.1.dist-info/WHEEL,sha256=8jTxASeLvPr09PZ22DGSMQlRkrmgeqGaotjla49xWxo,114
+htcondor-25.2.1.dist-info/top_level.txt,sha256=v4Qf76MjPw5Ld-EyM6v3J6nSJDLUr3XGMf-HiXKegK0,78
+htcondor-25.2.1.dist-info/RECORD,,

htcondor2/_schedd.py

@@ -31,6 +31,8 @@ from .htcondor2_impl import (
     _schedd_userrec_query,
     _schedd_act_on_job_ids,
     _schedd_act_on_job_constraint,
+    _schedd_act_on_userrec_list,
+    _schedd_act_on_userrec_constraint,
     _schedd_edit_job_ids,
     _schedd_edit_job_constraint,
     _schedd_reschedule,
@@ -98,6 +100,30 @@ def job_spec_hack(
     else:
         raise TypeError("The job_spec must be list of strings, a string, an int, or an ExprTree." );
 
+# helper method that routes various types of userrec_spec
+# to the correct userrec act function
+def userrec_act_dispatcher(
+    addr : str,
+    userrec_spec : Union[List[str], str, classad.ExprTree, List[classad.ClassAd] ],
+    f_name_list : callable,
+    f_constraint : callable,
+    args : list,
+):
+    if isinstance(userrec_spec, list):
+        if all([isinstance(i, str) for i in userrec_spec]):
+            return f_name_list(addr, userrec_spec, *args)
+        elif all([isinstance(i, classad.ClassAd) for i in userrec_spec]):
+            return f_name_list(addr, userrec_spec, args[0] + 0x20000, args[1])
+        else:
+            raise TypeError("All elements of the userrec list must be strings or classads");
+    elif isinstance(userrec_spec, classad.ExprTree):
+        job_spec_string = str(userrec_spec)
+        return f_constraint(addr, job_spec_string, *args)
+    elif isinstance(userrec_spec, str):
+        return f_name_list(addr, [userrec_spec], *args);
+    else:
+        raise TypeError("The userrec_spec must be list of strings, a list of ClassAd, a string, or an ExprTree." );
+
 
 class Schedd():
     '''
@@ -225,7 +251,7 @@ class Schedd():
         :param limit:  The maximum number of project ads to return.  The default
             (``-1``) is to return all ads.
         '''
-        project_flag = 1 # 0=default, 1=project, 2=user, 3=both
+        project_flag = 1 # 0=default/user, 1=project
         results = _schedd_userrec_query(self._addr, str(constraint), projection, int(limit), project_flag)
         if callback is None:
             return results
@@ -294,6 +320,150 @@ class Schedd():
 
         return pyResult
 
+    def addUserRec(self,
+        user_spec : Union[List[str], str, List[classad.ClassAd] ],
+    ) -> classad.ClassAd:
+        """
+        Add User record(s) to the *condor_schedd* daemon if a User
+        record with the given name does not already exist.
+
+        :param user_spec: Which user(s) to add.  A :class:`str`
+             of the username, a :class:`list` of such
+             strings, or a list of the initial User records in :class:`classad2.ClassAd` form.
+        :return:  A ClassAd describing the changes made.  This
+                  ClassAd is currently undocumented.
+        """
+
+        result = userrec_act_dispatcher(self._addr, user_spec,
+            _schedd_act_on_userrec_list, _schedd_act_on_userrec_constraint,
+            (0x10000 + 541, None)
+        )
+        return result;
+
+    def enableUserRec(self,
+        user_spec : Union[List[str], str, classad.ExprTree],
+    ) -> classad.ClassAd:
+        """
+        Enable User record(s) to the *condor_schedd* daemon.
+
+        :param user_spec: Which user(s) to enable.  A :class:`str`
+             of the username, a :class:`list` of such
+             strings, or a :class:`classad2.ExprTree` constraint.
+             When a constraint is used, only User records that
+             match the constraint will be enabled.
+        :return:  A ClassAd describing the changes made.  This
+                  ClassAd is currently undocumented.
+        """
+
+        result = userrec_act_dispatcher(self._addr, user_spec,
+            _schedd_act_on_userrec_list, _schedd_act_on_userrec_constraint,
+            (541, None)
+        )
+        return result;
+
+    def disableUserRec(self,
+        user_spec : Union[List[str], str, classad.ExprTree],
+        reason : str = None
+    ) -> classad.ClassAd:
+        """
+        Disable User record(s) in the *condor_schedd* daemon.
+
+        :param user_spec: Which user(s) to disable.  A :class:`str`
+             of the username, a :class:`list` of such
+             strings, or a :class:`classad2.ExprTree` constraint.
+             When a constraint is used, only User records that match
+             the constraint will be disabled.
+        :param reason: A free-form justification.  Defaults to
+            "Python-initiated action".
+        :return:  A ClassAd describing the changes made.  This
+                  ClassAd is currently undocumented.
+        """
+
+        if reason is None:
+            reason = "Python-initiated action"
+
+        result = userrec_act_dispatcher(self._addr, user_spec,
+            _schedd_act_on_userrec_list, _schedd_act_on_userrec_constraint,
+            (542, reason)
+        )
+        return result;
+
+    def removeUserRec(self,
+        user_spec : Union[List[str], str, classad.ExprTree],
+        reason : str = None
+    ) -> classad.ClassAd:
+        """
+        Remove User record(s) in the *condor_schedd* daemon.
+
+        :param user_spec: Which user(s) to remove.  A :class:`str`
+             of the username, a :class:`list` of such
+             strings, or a :class:`classad2.ExprTree` constraint.
+             When a constraint is used, only User records that match
+             the constraint will be removed.
+        :param reason: A free-form justification that is used when
+             the record cannot be removed.  Defaults to
+            "Python-initiated action".
+        :return:  A ClassAd describing the changes made.  This
+                  ClassAd is currently undocumented.
+        """
+
+        if reason is None:
+            reason = "Python-initiated action"
+
+        result = userrec_act_dispatcher(self._addr, user_spec,
+            _schedd_act_on_userrec_list, _schedd_act_on_userrec_constraint,
+            (549, reason)
+        )
+        return result;
+
+
+    def addProjectRec(self,
+        project_spec : Union[List[str], str, List[classad.ClassAd] ],
+    ) -> classad.ClassAd:
+        """
+        Add Project record(s) to the *condor_schedd* daemon.
+
+        :param project_spec: Which projects(s) to add.  A :class:`str`
+             of the project name, a :class:`list` of such
+             strings, or a list of the initial Project records in :class:`classad2.ClassAd` form.
+        :return:  A ClassAd describing the changes made.  This
+                  ClassAd is currently undocumented.
+        """
+
+        result = userrec_act_dispatcher(self._addr, project_spec,
+            _schedd_act_on_userrec_list, _schedd_act_on_userrec_constraint,
+            (0x10000 + 0x80000 + 541, None)
+        )
+        return result;
+
+    def removeProjectRec(self,
+        user_spec : Union[List[str], str, classad.ExprTree],
+        reason : str = None
+    ) -> classad.ClassAd:
+        """
+        Remove Project record(s) in the *condor_schedd* daemon.
+
+        :param Project_spec: Which projects(s) to remove.  A :class:`str`
+             of the project name, a :class:`list` of such
+             strings, or a :class:`classad2.ExprTree` constraint.
+             When a constraint is used, only User records that match
+             the constraint will be removed.
+        :param reason: A free-form justification that is used when
+             the record cannot be removed.  Defaults to
+            "Python-initiated action".
+        :return:  A ClassAd describing the changes made.  This
+                  ClassAd is currently undocumented.
+        """
+
+        if reason is None:
+            reason = "Python-initiated action"
+
+        result = userrec_act_dispatcher(self._addr, user_spec,
+            _schedd_act_on_userrec_list, _schedd_act_on_userrec_constraint,
+            (0x80000 + 549, reason)
+        )
+        return result;
+
 
     # In version 1, edit(ClassAd) and edit_multiple() weren't documented,
     # so they're not implemented in version 2.

htcondor2/personal.py

@@ -21,6 +21,7 @@ import os
 import shlex
 import signal
 import subprocess
+import sys
 import textwrap
 import time
 from pathlib import Path
@@ -384,8 +385,8 @@ class PersonalPool:
             "SEC_PASSWORD_DIRECTORY": self.passwords_dir.as_posix(),
             "SEC_TOKEN_DIRECTORY": self.tokens_dir.as_posix(),
             "SEC_TOKEN_SYSTEM_DIRECTORY": self.system_tokens_dir.as_posix(),
-            "MAIL": "/bin/true",
-            "SENDMAIL": "/bin/true",
+            "MAIL": "/usr/bin/true" if sys.platform == "darwin" else "/bin/true",
+            "SENDMAIL": "/usr/bin/true" if sys.platform == "darwin" else "/bin/true",
         }
 
         param_lines += ["# BASE PARAMS"]
@@ -627,9 +628,6 @@ class PersonalPool:
         )
 
     def _kill_condor_system(self):
-        if self._condor_master_is_alive():
-            return
-
         pids = self._daemon_pids()
         for pid in pids:
             os.kill(pid, signal.SIGKILL)