reqmgr2ms-output 2.3.6rc7__tar.gz → 2.3.6rc8__tar.gz

{reqmgr2ms-output-2.3.6rc7/src/python/reqmgr2ms_output.egg-info → reqmgr2ms-output-2.3.6rc8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: reqmgr2ms-output
-Version: 2.3.6rc7
+Version: 2.3.6rc8
 Summary: UNKNOWN
 Home-page: https://github.com/dmwm/WMCore
 Maintainer: CMS DMWM Group

{reqmgr2ms-output-2.3.6rc7 → reqmgr2ms-output-2.3.6rc8}/bin/patchComponent.sh

@@ -19,7 +19,7 @@ patchNum=$1
 shift
 
 [[ -z $patchNum ]] && patchNum=temp
-echo "Patching WMCore code with PR: $pathcNum"
+echo "Patching WMCore code with PR: $patchNum"
 
 currTag=$(python -c "from WMCore import __version__ as WMCoreVersion; print(WMCoreVersion)")
 echo "Current WMCoreTag: $currTag"
@@ -63,7 +63,7 @@ do
     echo dest: $pythonLibPath/$file
     curl -f https://raw.githubusercontent.com/dmwm/WMCore/$currTag/src/python/$file  -o $pythonLibPath/$file || { \
         echo file: $file missing at the origin.
-        echo Seems to be a new file for the curren patch.
+        echo Seems to be a new file for the current patch.
         echo Removing it from the destination as well!
         rm -f $pythonLibPath/$file
     }

{reqmgr2ms-output-2.3.6rc7 → reqmgr2ms-output-2.3.6rc8}/src/python/WMCore/ReqMgr/DataStructs/RequestStatus.py

@@ -128,10 +128,10 @@ ALLOWED_ACTIONS_FOR_STATUS = {
                             "NonCustodialSites", "Override",
                             "SubscriptionPriority"],
     "assigned": ["RequestPriority"],
-    "staging": ["RequestPriority", "SiteWhitelist", "SiteBlacklist"],
+    "staging": ["RequestPriority"],
     "staged": ["RequestPriority"],
-    "acquired": ["RequestPriority", "SiteWhitelist", "SiteBlacklist"],
-    "running-open": ["RequestPriority", "SiteWhitelist", "SiteBlacklist"],
+    "acquired": ["RequestPriority"],
+    "running-open": ["RequestPriority"],
     "running-closed": ["RequestPriority"],
     "failed": [],
     "force-complete": [],
@@ -146,18 +146,6 @@ ALLOWED_ACTIONS_FOR_STATUS = {
     "rejected-archived": [],
 }
 
-# NOTE: We need to Explicitly add RequestStatus to reqArgsDiff, since it is
-#       missing from the ALLOWED_ACTIONS_FOR_STATUS mapping. The alternative
-#       would be to add it as allowed action to every state.
-#       The same applies to few more, such as all the keys needed for the
-#       workqueue_stat_validation() calls, but we do this only during
-#       request parameters validation.
-ALLOWED_ACTIONS_ALL_STATUS = ["RequestStatus"]
-
-# NOTE: We need to explicitly add all stat keys during validation
-#       They are needed for the workqueue_stat_validation() calls
-ALLOWED_STAT_KEYS = ['total_jobs', 'input_lumis', 'input_events', 'input_num_files']
-
 # Workflow state transition automatically controlled by ReqMgr2
 ### NOTE: order of this list matters and it's used for status transition
 AUTO_TRANSITION = {"staged": ["acquired", "running-open", "running-closed", "completed"],
@@ -196,10 +184,7 @@ def get_modifiable_properties(status=None):
     TODO: Currently gets the result from hardcoded list. change to get from configuration or db
     """
     if status:
-        allowedKeys = ALLOWED_ACTIONS_FOR_STATUS.get(status, 'all_attributes')
-        # if not allowedKeys == 'all_attributes':
-        #     allowedKeys.extend(ALLOWED_ACTIONS_ALL_STATUS)
-        return allowedKeys
+        return ALLOWED_ACTIONS_FOR_STATUS.get(status, 'all_attributes')
     else:
         return ALLOWED_ACTIONS_FOR_STATUS
 

{reqmgr2ms-output-2.3.6rc7 → reqmgr2ms-output-2.3.6rc8}/src/python/WMCore/__init__.py

@@ -6,5 +6,5 @@ Core libraries for Workload Management Packages
 
 """
 
-__version__ = '2.3.6rc7'
+__version__ = '2.3.6rc8'
 __all__ = []

{reqmgr2ms-output-2.3.6rc7 → reqmgr2ms-output-2.3.6rc8/src/python/reqmgr2ms_output.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: reqmgr2ms-output
-Version: 2.3.6rc7
+Version: 2.3.6rc8
 Summary: UNKNOWN
 Home-page: https://github.com/dmwm/WMCore
 Maintainer: CMS DMWM Group