Skip to content

Removing the '\s' warnings from regexps #23

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
gtribello merged 1 commit into from
Oct 27, 2025
Merged

Removing the '\s' warnings from regexps #23

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
2 changes: 1 addition & 1 deletion src/PlumedToHTML/PlumedFormatter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def format(self, tokensource, outfile):
outfile.write( value )
elif ttype==Literal :
# mpirun -np for command line tools
if re.search("mpirun\s+-np", value ) :
if re.search(r"mpirun\s+-np", value ) :
outfile.write('<span class="plumedtooltip">' + value + '<span class="right">Run instances of PLUMED on this number of MPI processes<i></i></span></span>')
# --no-mpmi for command such as plumed --no-mpi tool ...
elif value=="--no-mpi" :
Expand Down
15 changes: 8 additions & 7 deletions src/PlumedToHTML/PlumedToHTML.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,10 @@ def get_cltoolarg_html( inpt, name, plumedexe ) :
"""
# Get the cltool that we are using
pl, tool = inpt.split()[0], inpt.split()[1]
if re.search("^mpirun\s+-np\s+[0-9]+\s+plumed",inpt) :
if re.search(r"^mpirun\s+-np\s+[0-9]+\s+plumed",inpt) :
tool = inpt.split()[4]
pl = inpt.split()[3]
if re.search("^plumed\s+\--no-mpi\s+", inpt) :
if re.search(r"^plumed\s+\--no-mpi\s+", inpt) :
tool = inpt.split()[2]
if pl!="plumed" and pl!="plumed-runtime" :
raise Exception("first word in the command should be plumed or plumed-runtime")
Expand Down Expand Up @@ -712,13 +712,14 @@ def processMarkdownString( inp, filename, plumedexe, plumed_names, actions, ofil
usemermaid = ""
# Create a collection of cltools to regexp for
plumed_syntax = getPlumedSyntax( plumedexe )
cltoolregexps, clfileregexps = [], []
cltoolregexps = []
clfileregexps = []
for key, data in plumed_syntax["cltools"].items() :
cltoolregexps.append("plumed\s+" + key )
cltoolregexps.append("plumed\s+--no-mpi\s+" + key )
cltoolregexps.append("plumed-runtime\s+" + key )
cltoolregexps.append(r"plumed\s+" + key )
cltoolregexps.append(r"plumed\s+--no-mpi\s+" + key )
cltoolregexps.append(r"plumed-runtime\s+" + key )
if data["inputtype"]=="file" :
clfileregexps.append( "#TOOL\s*=\s*" + key )
clfileregexps.append( r"#TOOL\s*=\s*" + key )

for line in inp.splitlines() :
# Detect and copy plumed input files
Expand Down