Skip to content

[v7r0] transformation scripts command line parsing, Components with underscores #4656

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

Merged
atsareg merged 3 commits into from
Jun 28, 2020
Merged

[v7r0] transformation scripts command line parsing, Components with underscores #4656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
105bcfb
ComponentInstaller: allow underscores in installed components
andresailer Jun 25, 2020
2661d6b
dirac-transformation-clean: fix use of position arguments
andresailer Jun 25, 2020
b3bd16c
Transformation scripts: allow command line flags (e.g., -ddd)
andresailer Jun 25, 2020
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
2 changes: 1 addition & 1 deletion FrameworkSystem/Client/ComponentInstaller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1130,7 +1130,7 @@ def getSetupComponents(self):

for cType in self.componentTypes:
if body.find('dirac-%s' % (cType)) != -1:
system, compT = component.split('_')[0:2]
system, compT = component.split('_', 1)
if system not in resultDict[resultIndexes[cType]]:
resultDict[resultIndexes[cType]][system] = []
resultDict[resultIndexes[cType]][system].append(compT)
Expand Down
6 changes: 3 additions & 3 deletions TransformationSystem/scripts/dirac-transformation-archive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
from __future__ import print_function
import sys

from DIRAC.Core.Base.Script import parseCommandLine
from DIRAC.Core.Base.Script import parseCommandLine, getPositionalArgs
parseCommandLine()

if len( sys.argv ) < 2:
if not getPositionalArgs():
print('Usage: dirac-transformation-archive transID [transID] [transID]')
sys.exit()
else:
transIDs = [int( arg ) for arg in sys.argv[1:]]
transIDs = [int(arg) for arg in getPositionalArgs()]

from DIRAC.TransformationSystem.Agent.TransformationCleaningAgent import TransformationCleaningAgent
from DIRAC.TransformationSystem.Client.TransformationClient import TransformationClient
Expand Down
7 changes: 3 additions & 4 deletions TransformationSystem/scripts/dirac-transformation-clean.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,17 @@
from __future__ import print_function
import sys

from DIRAC.Core.Base.Script import parseCommandLine
from DIRAC.Core.Base.Script import parseCommandLine, getPositionalArgs
parseCommandLine()

from DIRAC.TransformationSystem.Agent.TransformationCleaningAgent import TransformationCleaningAgent
from DIRAC.TransformationSystem.Client.TransformationClient import TransformationClient

if len( sys.argv ) < 2:
if not getPositionalArgs():
print('Usage: dirac-transformation-clean transID [transID] [transID]')
sys.exit()
else:
transIDs = [int( arg ) for arg in sys.argv[1:]]

transIDs = [int(arg) for arg in getPositionalArgs()]

agent = TransformationCleaningAgent( 'Transformation/TransformationCleaningAgent',
'Transformation/TransformationCleaningAgent',
Expand Down
6 changes: 3 additions & 3 deletions TransformationSystem/scripts/dirac-transformation-remove-output.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
from __future__ import print_function
import sys

from DIRAC.Core.Base.Script import parseCommandLine
from DIRAC.Core.Base.Script import parseCommandLine, getPositionalArgs
parseCommandLine()

if len( sys.argv ) < 2:
if not getPositionalArgs():
print('Usage: dirac-transformation-remove-output transID [transID] [transID]')
sys.exit()
else:
transIDs = [int( arg ) for arg in sys.argv[1:]]
transIDs = [int(arg) for arg in getPositionalArgs()]

from DIRAC.TransformationSystem.Agent.TransformationCleaningAgent import TransformationCleaningAgent
from DIRAC.TransformationSystem.Client.TransformationClient import TransformationClient
Expand Down
6 changes: 3 additions & 3 deletions TransformationSystem/scripts/dirac-transformation-verify-outputdata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
from __future__ import print_function
import sys

from DIRAC.Core.Base.Script import parseCommandLine
from DIRAC.Core.Base.Script import parseCommandLine, getPositionalArgs
parseCommandLine()

if len( sys.argv ) < 2:
if not getPositionalArgs():
print('Usage: dirac-transformation-verify-outputdata transID [transID] [transID]')
sys.exit()
else:
transIDs = [int( arg ) for arg in sys.argv[1:]]
transIDs = [int(arg) for arg in getPositionalArgs()]

from DIRAC.TransformationSystem.Agent.ValidateOutputDataAgent import ValidateOutputDataAgent
from DIRAC.TransformationSystem.Client.TransformationClient import TransformationClient
Expand Down