Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

python3: Update to 3.6.5

Browse Source
This commit is contained in:
Alexey Pavlov
2018-06-27 11:33:38 +03:00
parent ddb5ac5006
commit 2ff5e3aec1
6 changed files with 45 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
python3/00260-require-setuptools-dependencies.patch
View File

@@ -2,15 +2,16 @@ diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 9f5d151..4dfa8a1 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -10,13 +10,25 @@ import tempfile
@@ -10,13 +10,25 @@
__all__ = ["version", "bootstrap"]
-_SETUPTOOLS_VERSION = "28.8.0"
+_SETUPTOOLS_VERSION = "34.2.0"
_PIP_VERSION = "9.0.1"
-_SETUPTOOLS_VERSION = "39.0.1"
+_SETUPTOOLS_VERSION = "39.2.0"
-_PIP_VERSION = "9.0.3"
+_PIP_VERSION = "10.0.1"
+
+_SIX_VERSION = "1.10.0"
+
+_APPDIRS_VERSION = "1.4.0"
@@ -18,19 +19,17 @@ index 9f5d151..4dfa8a1 100644
+_PACKAGING_VERSION = "16.8"
+
+_PYPARSING_VERSION = "2.1.10"
+
_PROJECTS = [
- ("setuptools", _SETUPTOOLS_VERSION),
- ("pip", _PIP_VERSION),
+ ("setuptools", _SETUPTOOLS_VERSION),
+ ("pip", _PIP_VERSION),
("setuptools", _SETUPTOOLS_VERSION),
("pip", _PIP_VERSION),
+ ("six", _SIX_VERSION),
+ ("appdirs", _APPDIRS_VERSION),
+ ("packaging", _PACKAGING_VERSION),
+ ("pyparsing", _PYPARSING_VERSION)
]
diff --git a/Lib/test/test_ensurepip.py b/Lib/test/test_ensurepip.py
index 9b04c18..23664c4 100644
--- a/Lib/test/test_ensurepip.py
@@ -45,11 +44,11 @@ index 9b04c18..23664c4 100644
],
unittest.mock.ANY,
)
additional_paths = self.run_pip.call_args[0][1]
- self.assertEqual(len(additional_paths), 2)
+ self.assertEqual(len(additional_paths), 6)
def test_bootstrapping_with_root(self):
ensurepip.bootstrap(root="/foo/bar/")
@@ -55,7 +56,7 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase):
@@ -112,7 +111,7 @@ index 9b04c18..23664c4 100644
unittest.mock.ANY,
)
@@ -186,8 +192,8 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase):
self.run_pip.assert_called_once_with(
[
- "uninstall", "-y", "--disable-pip-version-check", "pip",
@@ -121,9 +120,9 @@ index 9b04c18..23664c4 100644
+ "pyparsing", "packaging", "appdirs", "six", "pip", "setuptools",
]
)
@@ -197,8 +203,8 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase):
self.run_pip.assert_called_once_with(
[
- "uninstall", "-y", "--disable-pip-version-check", "-v", "pip",
@@ -132,9 +131,9 @@ index 9b04c18..23664c4 100644
+ "pyparsing", "packaging", "appdirs", "six", "pip", "setuptools",
]
)
@@ -208,8 +214,8 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase):
self.run_pip.assert_called_once_with(
[
- "uninstall", "-y", "--disable-pip-version-check", "-vv", "pip",
@@ -152,7 +151,7 @@ index 9b04c18..23664c4 100644
+ "pyparsing", "packaging", "appdirs", "six", "pip", "setuptools",
]
)
@@ -260,13 +266,14 @@ class TestBootstrappingMainFunction(EnsurepipMixin, unittest.TestCase):
self.run_pip.assert_called_once_with(
[
@@ -163,15 +162,15 @@ index 9b04c18..23664c4 100644
],
unittest.mock.ANY,
)
additional_paths = self.run_pip.call_args[0][1]
- self.assertEqual(len(additional_paths), 2)
+ self.assertEqual(len(additional_paths), 6)
class TestUninstallationMainFunction(EnsurepipMixin, unittest.TestCase):
self.assertEqual(exit_code, 0)
def test_bootstrapping_error_code(self):
@@ -284,8 +291,8 @@ class TestUninstallationMainFunction(EnsurepipMixin, unittest.TestCase):
self.run_pip.assert_called_once_with(
[
- "uninstall", "-y", "--disable-pip-version-check", "pip",
@@ -180,4 +179,4 @@ index 9b04c18..23664c4 100644
+ "appdirs", "six", "pip", "setuptools",
]
)