Merge branch 'master' into safe-box-encoding

This commit is contained in:
Will McGugan 2020-10-07 11:00:05 +01:00
commit fee5749a40
3 changed files with 2 additions and 3 deletions

View File

@ -1,5 +1,5 @@
black==20.8b1 black==20.8b1
mypy==0.782 mypy==0.782
poetry==1.1.1 poetry==1.1.2
pytest==6.1.1 pytest==6.1.1
pytest-cov==2.10.1 pytest-cov==2.10.1

View File

@ -1415,7 +1415,7 @@ if __name__ == "__main__": # pragma: no cover
"options": [ "options": [
"New York Bulls", "New York Bulls",
"Los Angeles Kings", "Los Angeles Kings",
"Golden State Warriros", "Golden State Warriors",
"Huston Rocket", "Huston Rocket",
], ],
"answer": "Huston Rocket", "answer": "Huston Rocket",

View File

@ -271,7 +271,6 @@ class Syntax(JupyterMixin):
Args: Args:
path (str): Path to file to highlight. path (str): Path to file to highlight.
encoding (str): Encoding of file. encoding (str): Encoding of file.
lexer_name (str): Lexer to use (see https://pygments.org/docs/lexers/)
theme (str, optional): Color theme, aka Pygments style (see https://pygments.org/docs/styles/#getting-a-list-of-available-styles). Defaults to "emacs". theme (str, optional): Color theme, aka Pygments style (see https://pygments.org/docs/styles/#getting-a-list-of-available-styles). Defaults to "emacs".
dedent (bool, optional): Enable stripping of initial whitespace. Defaults to True. dedent (bool, optional): Enable stripping of initial whitespace. Defaults to True.
line_numbers (bool, optional): Enable rendering of line numbers. Defaults to False. line_numbers (bool, optional): Enable rendering of line numbers. Defaults to False.