From f8cfdf0623f8df879cc7344b635f58c6c208aedd Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 15 Feb 2016 07:07:34 +0100 Subject: [PATCH 1/4] requirements: Update Pygments to 2.1.1. - Fixed Jython compatibility - Fixed HTML formatter output with leading empty lines - Added a mapping table for LaTeX encodings and added utf8 - Fixed image formatter font searching on Macs - Fixed deepcopy-ing of Token instances - Fixed Julia string interpolation - Fixed statefulness of HttpLexer between get_tokens calls - Many smaller fixes to various lexers --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c13f1d04e..5d38700eb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ Jinja2==2.8.0 MarkupSafe==0.23 -Pygments==2.1 +Pygments==2.1.1 pyPEG2==2.15.2 PyYAML==3.11 colorama==0.3.6 From 3aaa4395b8858436af4266a1a75f7b03f2705acd Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 15 Feb 2016 07:08:31 +0100 Subject: [PATCH 2/4] tox: Update Werkzeug to 0.11.4. - Fixed werkzeug.serving not working from -m flag. - Fixed incorrect weak etag handling. --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index b264b3f2c..b64bc9815 100644 --- a/tox.ini +++ b/tox.ini @@ -41,7 +41,7 @@ deps = six==1.10.0 termcolor==1.1.0 vulture==0.8.1 - Werkzeug==0.11.3 + Werkzeug==0.11.4 wheel==0.29.0 xvfbwrapper==0.2.8 cherrypy==5.0.1 From 74e168c33924fc89d46c898411e863c82ff773a4 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 15 Feb 2016 07:47:29 +0100 Subject: [PATCH 3/4] Update Pygments test file. --- tests/integration/data/misc/hello.txt.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/data/misc/hello.txt.html b/tests/integration/data/misc/hello.txt.html index 5a59b8934..3b568f5c9 100644 --- a/tests/integration/data/misc/hello.txt.html +++ b/tests/integration/data/misc/hello.txt.html @@ -77,7 +77,7 @@ body .il { color: #666666 } /* Literal.Number.Integer.Long */ 

1
-2
<html><head></head><body><pre style="word-wrap: break-word; white-space: pre-wrap;">Hello World!
+2
<html><head></head><body><pre style="word-wrap: break-word; white-space: pre-wrap;">Hello World!
 </pre></body></html>
From ff779ef329a92dd0fa836bd312f822b7429716bc Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 15 Feb 2016 07:52:51 +0100 Subject: [PATCH 4/4] Update .eslintrc for eslint 2.0. --- .eslintrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eslintrc b/.eslintrc index a3be3a479..70947143a 100644 --- a/.eslintrc +++ b/.eslintrc @@ -30,7 +30,7 @@ rules: no-unneeded-ternary: 2 operator-assignment: [2, "always"] operator-linebreak: [2, "after"] - space-after-keywords: [2, "always"] + keyword-spacing: 2 space-before-blocks: [2, "always"] space-before-function-paren: [2, {"anonymous": "never", "named": "never"}] object-curly-spacing: [2, "never"]