lsst-ctrl-platform-s3df 30.0.1rc1__tar.gz → 30.2026.300__tar.gz

{lsst_ctrl_platform_s3df-30.0.1rc1 → lsst_ctrl_platform_s3df-30.2026.300}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-ctrl-platform-s3df
-Version: 30.0.1rc1
+Version: 30.2026.300
 Summary: Configuration and template files for s3df ctrl-execute platform.
 Project-URL: Source, https://github.com/lsst/ctrl_platform_s3df
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>

{lsst_ctrl_platform_s3df-30.0.1rc1 → lsst_ctrl_platform_s3df-30.2026.300}/pyproject.toml

@@ -23,9 +23,6 @@ dependencies = []
 [dependency-groups]
 dev = [
     "lsst-ctrl-execute",
-    # Until new ctrl-execute appears that can be pinned to support the
-    # pex_config changes, require the pex_config version
-    "lsst-pex-config >= 30.2026.300",
     "pre-commit>=4.0.1",
     "pytest",
     "pytest-cov",

{lsst_ctrl_platform_s3df-30.0.1rc1 → lsst_ctrl_platform_s3df-30.2026.300}/python/lsst/ctrl/platform/s3df/etc/templates/allocation.sh.template

@@ -53,26 +53,7 @@ export _condor_CONDOR_HOST=${RUBIN_COLLECTOR_HOST}
 export _condor_COLLECTOR_HOST=${RUBIN_COLLECTOR_HOST}
 export _condor_CCB_ADDRESS=${RUBIN_COLLECTOR_HOST}
 
-# Determining the OS MAJOR_VERSION in order to utilize an
-# appropriate HTCondor binary tarball for RELEASE_DIR.
-# HTCondor releases different binaries for Alma8, Alma9, etc.
-OSIN=`cat /etc/os-release  | grep VERSION_ID`
-while IFS='"' read -ra TOK; do
-  FULL_VERSION="${TOK[1]}"
-  echo "FULL_VERSION $FULL_VERSION"
-  while IFS='.' read -ra TOKEN; do
-    MAJOR_VERSION="${TOKEN[0]}"
-  done <<< "$FULL_VERSION"
-done <<< "$OSIN"
-echo "MAJOR_VERSION $MAJOR_VERSION"
-if [ $MAJOR_VERSION == 9 ]; then
-   echo "It is Rocky9 Torino"
-   export RELEASE_DIR=/sdf/group/rubin/sw/htcondor.d/rocky9/current
-else
-   echo "RHEL8 standard"
-   export RELEASE_DIR=/sdf/group/rubin/sw/htcondor
-fi
-echo "Using RELEASE_DIR ${RELEASE_DIR}"
+export RELEASE_DIR=/sdf/group/rubin/sw/htcondor
 export _CONDOR_RELEASE_DIR=${RELEASE_DIR}
 export _CONDOR_SBIN=${RELEASE_DIR}/sbin
 export _CONDOR_FILETRANSFER_PLUGINS=${RELEASE_DIR}/libexec/curl_plugin

{lsst_ctrl_platform_s3df-30.0.1rc1 → lsst_ctrl_platform_s3df-30.2026.300}/tests/test_load.py

@@ -10,7 +10,7 @@ def test_exec_config():
     exec_config_name = find_package_file("execConfig.py", platform="s3df")
 
     configuration = CondorConfig()
-    configuration.load(exec_config_name)
+    configuration.loadFromStream(exec_config_name)
     assert configuration.platform.scheduler == "slurm"
 
 
@@ -18,7 +18,7 @@ def test_allocation_config():
     slurm_config_name = find_package_file("slurmConfig.py", platform="s3df")
 
     configuration = AllocationConfig()
-    configuration.load(slurm_config_name)
+    configuration.loadFromStream(slurm_config_name)
     assert configuration.platform.queue == "$QUEUE"