Merge branch 'sr.2019.08.06' into 'master'

Misc package bumps for Maintainer: Max Rees, 2019.08.06

See merge request adelie/packages!313

1 files changed, 44 insertions, 0 deletions

diff --git a/user/py3-virtualenv/python3.patch b/user/py3-virtualenv/python3.patch
new file mode 100644
index 000000000..f1550f49c
--- /dev/null
+++ b/user/py3-virtualenv/python3.patch
@@ -0,0 +1,44 @@
+--- virtualenv-16.7.2/virtualenv.py
++++ virtualenv-16.7.2/virtualenv.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ """Create a "virtual" Python installation"""
+ 
+ # fmt: off
+@@ -82,7 +82,7 @@ DEFAULT_CONFIG_FILE = os.path.join(DEFAU
+ if IS_PYPY:
+     EXPECTED_EXE = "pypy"
+ else:
+-    EXPECTED_EXE = "python"
++    EXPECTED_EXE = "python3"
+ 
+ # Return a mapping of version -> Python executable
+ # Only provided for Windows, where the information in the registry is used
+--- virtualenv-16.7.2/tasks/update_embedded.py
++++ virtualenv-16.7.2/tasks/update_embedded.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ """
+ Helper script to rebuild virtualenv.py from virtualenv_support
+ """
+--- virtualenv-16.7.2/tests/test_virtualenv.py
++++ virtualenv-16.7.2/tests/test_virtualenv.py
+@@ -288,14 +288,14 @@ def test_resolve_interpreter_with_invali
+ def test_activate_after_future_statements():
+     """Should insert activation line after last future statement"""
+     script = [
+-        "#!/usr/bin/env python",
++        "#!/usr/bin/env python3",
+         "from __future__ import with_statement",
+         "from __future__ import print_function",
+         'print("Hello, world!")',
+     ]
+     out = virtualenv.relative_script(script)
+     assert out == [
+-        "#!/usr/bin/env python",
++        "#!/usr/bin/env python3",
+         "from __future__ import with_statement",
+         "from __future__ import print_function",
+         "",