summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatth?us G. Chajdas <dev@anteru.net>2018-12-21 17:34:15 +0100
committerMatth?us G. Chajdas <dev@anteru.net>2018-12-21 17:34:15 +0100
commit6c9c585cc788aceb6798e059cfe1a0820577a3d6 (patch)
tree5e25845ea91f2a976567e2413c289d7609736cc4
parent5e5f02aa70471bafc6f4b61101e2099514596b91 (diff)
downloadpygments-6c9c585cc788aceb6798e059cfe1a0820577a3d6.tar.gz
Small cleanups to the Slurm lexer.
Remove debug output, add a test file for the Slurm lexer.
-rw-r--r--CHANGES1
-rw-r--r--pygments/lexers/_mapping.py2
-rw-r--r--pygments/lexers/shell.py6
-rw-r--r--tests/examplefiles/example.sl6
4 files changed, 12 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index e868c096..6d6f463a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,7 @@ Version 2.4.0
* FloScript (PR#750)
* Hspec (PR#790)
+ * Slurm (PR#760)
- Updated lexers:
diff --git a/pygments/lexers/_mapping.py b/pygments/lexers/_mapping.py
index 494f2d6b..d9894a33 100644
--- a/pygments/lexers/_mapping.py
+++ b/pygments/lexers/_mapping.py
@@ -385,7 +385,7 @@ LEXERS = {
'ShenLexer': ('pygments.lexers.lisp', 'Shen', ('shen',), ('*.shen',), ('text/x-shen', 'application/x-shen')),
'SilverLexer': ('pygments.lexers.verification', 'Silver', ('silver',), ('*.sil', '*.vpr'), ()),
'SlimLexer': ('pygments.lexers.webmisc', 'Slim', ('slim',), ('*.slim',), ('text/x-slim',)),
- 'SlurmBashLexer': ('pygments.lexers.shell', 'Slurm', ('slurm', 'sbatch'), ('*.sl',), ('application/x-sh', 'application/x-shellscript')),
+ 'SlurmBashLexer': ('pygments.lexers.shell', 'Slurm', ('slurm', 'sbatch'), ('*.sl',), ()),
'SmaliLexer': ('pygments.lexers.dalvik', 'Smali', ('smali',), ('*.smali',), ('text/smali',)),
'SmalltalkLexer': ('pygments.lexers.smalltalk', 'Smalltalk', ('smalltalk', 'squeak', 'st'), ('*.st',), ('text/x-smalltalk',)),
'SmartyLexer': ('pygments.lexers.templates', 'Smarty', ('smarty',), ('*.tpl',), ('application/x-smarty',)),
diff --git a/pygments/lexers/shell.py b/pygments/lexers/shell.py
index 5e9fcd6a..86d8c37a 100644
--- a/pygments/lexers/shell.py
+++ b/pygments/lexers/shell.py
@@ -129,23 +129,25 @@ class BashLexer(RegexLexer):
class SlurmBashLexer(BashLexer):
"""
Lexer for (ba|k|z|)sh Slurm scripts.
+
+ .. versionadded:: 2.4
"""
name = 'Slurm'
aliases = ['slurm', 'sbatch']
filenames = ['*.sl']
+ mimetypes = []
EXTRA_KEYWORDS = {'srun'}
def get_tokens_unprocessed(self, text):
for index, token, value in BashLexer.get_tokens_unprocessed(self, text):
- print(index, token, value)
if token is Text and value in self.EXTRA_KEYWORDS:
yield index, Name.Builtin, value
elif token is Comment.Single and 'SBATCH' in value:
yield index, Keyword.Pseudo, value
else:
yield index, token, value
-
+
class ShellSessionBaseLexer(Lexer):
"""
Base lexer for simplistic shell sessions.
diff --git a/tests/examplefiles/example.sl b/tests/examplefiles/example.sl
new file mode 100644
index 00000000..5fb430de
--- /dev/null
+++ b/tests/examplefiles/example.sl
@@ -0,0 +1,6 @@
+#!/bin/bash
+#SBATCH --partition=part
+#SBATCH --job-name=job
+#SBATCH --mem=1G
+#SBATCH --cpus-per-task=8
+srun /usr/bin/sleep \ No newline at end of file