Scheduled monthly dependency update for December (#27)

* Update pygments from 2.2.0 to 2.3.0

* Update pygments from 2.2.0 to 2.3.0

* Update sphinx from 1.6.5 to 1.8.2

* Update sphinxcontrib-websupport from 1.0.1 to 1.1.0

* Update coverage from 4.4.1 to 4.5.2

* Update flake8 from 3.5.0 to 3.6.0

* Update isort from 4.2.15 to 4.3.4

* Update pycodestyle from 2.3.1 to 2.4.0

* Update pyflakes from 1.6.0 to 2.0.0

* Update pytest from 3.2.3 to 4.0.1

* Update pytest-cov from 2.5.1 to 2.6.0

* Update pytest-isort from 0.1.0 to 0.2.1

* Update pytest-mock from 1.6.3 to 1.10.0

* Update pytest-sugar from 0.9.0 to 0.9.2

* Update pytest-toolbox from 0.2 to 0.4

* fixing tests and regexes

* fix python version checks

* travis faffing

Author: pyup-bot

.gitignore

@@ -2,6 +2,7 @@
 env/
 env35/
 env36/
+env37/
 *.py[cod]
 *.egg-info/
 build/

.travis.yml

@@ -2,14 +2,19 @@ language: python
 
 cache: pip
 
-python:
-- '3.5'
-- '3.6'
-- 'nightly'  # currently 3.7
-
 matrix:
+  include:
+  - python: '3.5'
+  - python: '3.6'
+  - python: '3.7'
+    dist: xenial
+    sudo: required
+  - python: '3.8-dev'
+    dist: xenial
+    sudo: required
+
   allow_failures:
-  - python: 'nightly'
+  - python: '3.8-dev'
 
 install:
 - make install-test

devtools/ansi.py

@@ -4,7 +4,7 @@
 from typing import Any
 
 _ansi_template = '\033[{}m'
-_ansi_re = re.compile('\033\[((?:\d|;)*)([a-zA-Z])')
+_ansi_re = re.compile('\033\\[((?:\\d|;)*)([a-zA-Z])')
 
 __all__ = 'sformat', 'sprint'
 
@@ -68,7 +68,7 @@ class Style(IntEnum):
     # this is a meta value used for the "Style" instance which is the "style" function
     function = -1
 
-    def __call__(self, input: Any, *styles, reset: bool=True, apply: bool=True):
+    def __call__(self, input: Any, *styles, reset: bool = True, apply: bool = True):
         """
         Styles text with ANSI styles and returns the new string.
 

devtools/debug.py

@@ -93,9 +93,9 @@ class Debug:
     )
 
     def __init__(self, *,
-                 warnings: Optional[bool]=None,
-                 highlight: Optional[bool]=None,
-                 frame_context_length: int=50):
+                 warnings: Optional[bool] = None,
+                 highlight: Optional[bool] = None,
+                 frame_context_length: int = 50):
         self._show_warnings = self._env_bool(warnings, 'PY_DEVTOOLS_WARNINGS', True)
         self._highlight = self._env_bool(highlight, 'PY_DEVTOOLS_HIGHLIGHT', None)
         # 50 lines should be enough to make sure we always get the entire function definition
@@ -271,7 +271,7 @@ def _get_offsets(func_ast):
         for kw in func_ast.keywords:
             yield kw.value.lineno - 2, kw.value.col_offset - len(kw.arg) - 2
 
-    def _warn(self, msg, category: Type[Warning]=RuntimeWarning):
+    def _warn(self, msg, category: Type[Warning] = RuntimeWarning):
         if self._show_warnings:
             warnings.warn(msg, category)
 

devtools/prettier.py

@@ -1,8 +1,9 @@
-import collections
 import io
 import os
 import textwrap
-from typing import Any, Generator, Union
+from collections import OrderedDict
+from collections.abc import Generator
+from typing import Any, Union
 
 from .ansi import isatty
 
@@ -53,10 +54,10 @@ def __init__(self,
             (bytes, self._format_bytes),
             (tuple, self._format_tuples),
             ((list, set, frozenset), self._format_list_like),
-            (collections.Generator, self._format_generators),
+            (Generator, self._format_generators),
         ]
 
-    def __call__(self, value: Any, *, indent: int=0, indent_first: bool=False, highlight: bool=False):
+    def __call__(self, value: Any, *, indent: int = 0, indent_first: bool = False, highlight: bool = False):
         self._stream = io.StringIO()
         self._format(value, indent_current=indent, indent_first=indent_first)
         s = self._stream.getvalue()
@@ -70,7 +71,7 @@ def _format(self, value: Any, indent_current: int, indent_first: bool):
             self._stream.write(indent_current * self._c)
 
         value_repr = repr(value)
-        if len(value_repr) <= self._simple_cutoff and not isinstance(value, collections.Generator):
+        if len(value_repr) <= self._simple_cutoff and not isinstance(value, Generator):
             self._stream.write(value_repr)
         else:
             indent_new = indent_current + self._indent_step
@@ -82,7 +83,7 @@ def _format(self, value: Any, indent_current: int, indent_first: bool):
 
     def _format_dict(self, value: dict, value_repr: str, indent_current: int, indent_new: int):
         open_, before_, split_, after_, close_ = '{\n', indent_new * self._c, ': ', ',\n', '}'
-        if isinstance(value, collections.OrderedDict):
+        if isinstance(value, OrderedDict):
             open_, split_, after_, close_ = 'OrderedDict([\n', ', ', '),\n', '])'
             before_ += '('
         self._stream.write(open_)

docs/requirements.txt

@@ -1,4 +1,4 @@
 ansi2html  # pyup: ignore
-Pygments==2.2.0
-Sphinx==1.6.5
-sphinxcontrib-websupport==1.0.1
+Pygments==2.3.0
+Sphinx==1.8.2
+sphinxcontrib-websupport==1.1.0

tests/conftest.py

@@ -0,0 +1,5 @@
+import os
+
+
+def pytest_sessionstart(session):
+    os.environ.pop('PY_DEVTOOLS_HIGHLIGHT', None)

tests/requirements.txt

@@ -1,14 +1,14 @@
-coverage==4.4.1
+coverage==4.5.2
 docutils==0.14
-flake8==3.5.0
-isort==4.2.15
-pycodestyle==2.3.1
-pyflakes==1.6.0
-Pygments==2.2.0
-pytest==3.2.3
-pytest-cov==2.5.1
-pytest-isort==0.1.0
-pytest-mock==1.6.3
-pytest-sugar==0.9.0
-pytest-toolbox==0.2
+flake8==3.6.0
+isort==4.3.4
+pycodestyle==2.4.0
+pyflakes==2.0.0
+Pygments==2.3.0
+pytest==4.0.1
+pytest-cov==2.6.0
+pytest-isort==0.2.1
+pytest-mock==1.10.0
+pytest-sugar==0.9.2
+pytest-toolbox==0.4
 numpy  # pyup: ignore

tests/test_expr_render.py

@@ -14,7 +14,7 @@ def foobar(a, b, c):
 def test_simple():
     a = [1, 2, 3]
     v = debug.format(len(a))
-    s = re.sub(':\d{2,}', ':<line no>', str(v))
+    s = re.sub(r':\d{2,}', ':<line no>', str(v))
     # print(s)
     assert (
         'tests/test_expr_render.py:<line no> test_simple\n'
@@ -25,7 +25,7 @@ def test_simple():
 def test_subscription():
     a = {1: 2}
     v = debug.format(a[1])
-    s = re.sub(':\d{2,}', ':<line no>', str(v))
+    s = re.sub(r':\d{2,}', ':<line no>', str(v))
     assert (
         'tests/test_expr_render.py:<line no> test_subscription\n'
         '    a[1]: 2 (int)'
@@ -76,7 +76,7 @@ def test_exotic_types():
 def test_newline():
     v = debug.format(
         foobar(1, 2, 3))
-    s = re.sub(':\d{2,}', ':<line no>', str(v))
+    s = re.sub(r':\d{2,}', ':<line no>', str(v))
     # print(s)
     assert (
         'tests/test_expr_render.py:<line no> test_newline\n'
@@ -88,7 +88,7 @@ def test_trailing_bracket():
     v = debug.format(
         foobar(1, 2, 3)
     )
-    s = re.sub(':\d{2,}', ':<line no>', str(v))
+    s = re.sub(r':\d{2,}', ':<line no>', str(v))
     # print(s)
     assert (
         'tests/test_expr_render.py:<line no> test_trailing_bracket\n'
@@ -102,7 +102,7 @@ def test_multiline():
                2,
                3)
     )
-    s = re.sub(':\d{2,}', ':<line no>', str(v))
+    s = re.sub(r':\d{2,}', ':<line no>', str(v))
     # print(s)
     assert (
         'tests/test_expr_render.py:<line no> test_multiline\n'
@@ -114,7 +114,7 @@ def test_multiline_trailing_bracket():
     v = debug.format(
         foobar(1, 2, 3
                ))
-    s = re.sub(':\d{2,}', ':<line no>', str(v))
+    s = re.sub(r':\d{2,}', ':<line no>', str(v))
     # print(s)
     assert (
         'tests/test_expr_render.py:<line no> test_multiline_trailing_bracket\n'
@@ -129,7 +129,7 @@ def test_kwargs():
         a=6,
         b=7
     )
-    s = re.sub(':\d{2,}', ':<line no>', str(v))
+    s = re.sub(r':\d{2,}', ':<line no>', str(v))
     assert (
         'tests/test_expr_render.py:<line no> test_kwargs\n'
         '    foobar(1, 2, 3): 6 (int)\n'
@@ -146,7 +146,7 @@ def test_kwargs_multiline():
         a=6,
         b=7
     )
-    s = re.sub(':\d{2,}', ':<line no>', str(v))
+    s = re.sub(r':\d{2,}', ':<line no>', str(v))
     assert (
         'tests/test_expr_render.py:<line no> test_kwargs_multiline\n'
         '    foobar(1, 2, 3): 6 (int)\n'
@@ -161,7 +161,7 @@ def test_multiple_trailing_lines():
             1, 2, 3
         ),
     )
-    s = re.sub(':\d{2,}', ':<line no>', str(v))
+    s = re.sub(r':\d{2,}', ':<line no>', str(v))
     assert (
         'tests/test_expr_render.py:<line no> test_multiple_trailing_lines\n    foobar( 1, 2, 3 ): 6 (int)'
     ) == s
@@ -187,7 +187,7 @@ def test_syntax_warning():
     assert 'Error: unexpected EOF while parsing (test_expr_render.py' in str(warning.message)
     # check only the original code is included in the warning
     assert '-1\n"' in str(warning.message)
-    s = re.sub(':\d{2,}', ':<line no>', str(v))
+    s = re.sub(r':\d{2,}', ':<line no>', str(v))
     assert (
         'tests/test_expr_render.py:<line no> test_syntax_warning\n    1 (int)'
     ) == s
@@ -221,7 +221,7 @@ async def bar():
 
     loop = asyncio.get_event_loop()
     v = loop.run_until_complete(bar())
-    s = re.sub(':\d{2,}', ':<line no>', str(v))
+    s = re.sub(r':\d{2,}', ':<line no>', str(v))
     assert (
         'tests/test_expr_render.py:<line no> bar\n'
         '    1 (int)'

tests/test_main.py

@@ -15,7 +15,7 @@ def test_print(capsys):
     debug(a, b)
     stdout, stderr = capsys.readouterr()
     print(stdout)
-    assert re.sub(':\d{2,}', ':<line no>', stdout) == (
+    assert re.sub(r':\d{2,}', ':<line no>', stdout) == (
         'tests/test_main.py:<line no> test_print\n'
         '    a: 1 (int)\n'
         '    b: 2 (int)\n'
@@ -27,7 +27,7 @@ def test_format():
     a = b'i might bite'
     b = "hello this is a test"
     v = debug.format(a, b)
-    s = re.sub(':\d{2,}', ':<line no>', str(v))
+    s = re.sub(r':\d{2,}', ':<line no>', str(v))
     print(repr(s))
     assert s == (
         "tests/test_main.py:<line no> test_format\n"
@@ -70,7 +70,7 @@ def test_odd_path(mocker):
     mocked_relative_to = mocker.patch('pathlib.Path.relative_to')
     mocked_relative_to.side_effect = ValueError()
     v = debug.format('test')
-    assert re.search("/.*?/test_main.py:\d{2,} test_odd_path\n    'test' \(str\) len=4", str(v)), v
+    assert re.search(r"/.*?/test_main.py:\d{2,} test_odd_path\n    'test' \(str\) len=4", str(v)), v
 
 
 def test_small_call_frame():
@@ -80,7 +80,7 @@ def test_small_call_frame():
         2,
         3,
     )
-    assert re.sub(':\d{2,}', ':<line no>', str(v)) == (
+    assert re.sub(r':\d{2,}', ':<line no>', str(v)) == (
         'tests/test_main.py:<line no> test_small_call_frame\n'
         '    1 (int)\n'
         '    2 (int)\n'
@@ -96,7 +96,7 @@ def test_small_call_frame_warning():
             2,
             3,
         )
-    assert re.sub(':\d{2,}', ':<line no>', str(v)) == (
+    assert re.sub(r':\d{2,}', ':<line no>', str(v)) == (
         'tests/test_main.py:<line no> test_small_call_frame_warning\n'
         '    1 (int)\n'
         '    2 (int)\n'
@@ -108,7 +108,7 @@ def test_small_call_frame_warning():
 def test_kwargs():
     a = 'variable'
     v = debug.format(first=a, second='literal')
-    s = re.sub(':\d{2,}', ':<line no>', str(v))
+    s = re.sub(r':\d{2,}', ':<line no>', str(v))
     print(s)
     assert s == (
         "tests/test_main.py:<line no> test_kwargs\n"
@@ -121,7 +121,7 @@ def test_kwargs_orderless():
     # for python3.5
     a = 'variable'
     v = debug.format(first=a, second='literal')
-    s = re.sub(':\d{2,}', ':<line no>', str(v))
+    s = re.sub(r':\d{2,}', ':<line no>', str(v))
     assert set(s.split('\n')) == {
         "tests/test_main.py:<line no> test_kwargs_orderless",
         "    first: 'variable' (str) len=8 variable=a",
@@ -131,14 +131,14 @@ def test_kwargs_orderless():
 
 def test_simple_vars():
     v = debug.format('test', 1, 2)
-    s = re.sub(':\d{2,}', ':<line no>', str(v))
+    s = re.sub(r':\d{2,}', ':<line no>', str(v))
     assert s == (
         "tests/test_main.py:<line no> test_simple_vars\n"
         "    'test' (str) len=4\n"
         "    1 (int)\n"
         "    2 (int)"
     )
-    r = re.sub(':\d{2,}', ':<line no>', repr(v))
+    r = re.sub(r':\d{2,}', ':<line no>', repr(v))
     assert r == (
         "<DebugOutput tests/test_main.py:<line no> test_simple_vars arguments: 'test' (str) len=4 1 (int) 2 (int)>"
     )
@@ -203,7 +203,7 @@ def test_exec(capsys):
 
 def test_colours():
     v = debug.format(range(6))
-    s = re.sub(':\d{2,}', ':<line no>', v.str(True))
+    s = re.sub(r':\d{2,}', ':<line no>', v.str(True))
     assert s.startswith('\x1b[35mtests'), repr(s)
     s2 = strip_ansi(s)
     assert s2 == v.str(), repr(s2)