FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

bpo-29523: Update setuptools to 34.2.0 and bundle its dependencies. by stratakis · Pull Request #67 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

bpo-29523: Update setuptools to 34.2.0 and bundle its dependencies. #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
stratakis wants to merge 1 commit into from
Conversation 10 Commits 1 Checks 0 Files changed
Closed

bpo-29523: Update setuptools to 34.2.0 and bundle its dependencies. #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .py  (2) .whl  (5) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
18 changes: 15 additions & 3 deletions Lib/ensurepip/__init__.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,25 @@
__all__ = ["version", "bootstrap"]


_SETUPTOOLS_VERSION = "28.8.0"
_SETUPTOOLS_VERSION = "34.2.0"

_PIP_VERSION = "9.0.1"

_SIX_VERSION = "1.10.0"

_APPDIRS_VERSION = "1.4.0"

_PACKAGING_VERSION = "16.8"

_PYPARSING_VERSION = "2.1.10"

_PROJECTS = [
("setuptools", _SETUPTOOLS_VERSION),
("pip", _PIP_VERSION),
("setuptools", _SETUPTOOLS_VERSION),
("pip", _PIP_VERSION),
("six", _SIX_VERSION),
("appdirs", _APPDIRS_VERSION),
("packaging", _PACKAGING_VERSION),
("pyparsing", _PYPARSING_VERSION)
]


Expand Down
Binary file added Lib/ensurepip/_bundled/appdirs-1.4.0-py2.py3-none-any.whl
Show comments
View file
Open in desktop
Binary file not shown.
Binary file added Lib/ensurepip/_bundled/packaging-16.8-py2.py3-none-any.whl
Show comments
View file
Open in desktop
Binary file not shown.
Binary file added Lib/ensurepip/_bundled/pyparsing-2.1.10-py2.py3-none-any.whl
Show comments
View file
Open in desktop
Binary file not shown.
Binary file renamed ...ed/setuptools-28.8.0-py2.py3-none-any.whl → ...ed/setuptools-34.2.0-py2.py3-none-any.whl
Show comments
View file
Open in desktop
Binary file not shown.
Binary file added Lib/ensurepip/_bundled/six-1.10.0-py2.py3-none-any.whl
Show comments
View file
Open in desktop
Binary file not shown.
45 changes: 26 additions & 19 deletions Lib/test/test_ensurepip.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,14 @@ def test_basic_bootstrapping(self):
self.run_pip.assert_called_once_with(
[
"install", "--no-index", "--find-links",
unittest.mock.ANY, "setuptools", "pip",
unittest.mock.ANY,
"setuptools", "pip", "six", "appdirs", "packaging", "pyparsing",
],
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/")
Expand All @@ -55,7 +56,7 @@ def test_bootstrapping_with_root(self):
[
"install", "--no-index", "--find-links",
unittest.mock.ANY, "--root", "/foo/bar/",
"setuptools", "pip",
"setuptools", "pip", "six", "appdirs", "packaging", "pyparsing",
],
unittest.mock.ANY,
)
Expand All @@ -66,7 +67,8 @@ def test_bootstrapping_with_user(self):
self.run_pip.assert_called_once_with(
[
"install", "--no-index", "--find-links",
unittest.mock.ANY, "--user", "setuptools", "pip",
unittest.mock.ANY, "--user",
"setuptools", "pip", "six", "appdirs", "packaging", "pyparsing",
],
unittest.mock.ANY,
)
Expand All @@ -77,7 +79,8 @@ def test_bootstrapping_with_upgrade(self):
self.run_pip.assert_called_once_with(
[
"install", "--no-index", "--find-links",
unittest.mock.ANY, "--upgrade", "setuptools", "pip",
unittest.mock.ANY, "--upgrade",
"setuptools", "pip", "six", "appdirs", "packaging", "pyparsing",
],
unittest.mock.ANY,
)
Expand All @@ -88,7 +91,8 @@ def test_bootstrapping_with_verbosity_1(self):
self.run_pip.assert_called_once_with(
[
"install", "--no-index", "--find-links",
unittest.mock.ANY, "-v", "setuptools", "pip",
unittest.mock.ANY, "-v",
"setuptools", "pip", "six", "appdirs", "packaging", "pyparsing",
],
unittest.mock.ANY,
)
Expand All @@ -99,7 +103,8 @@ def test_bootstrapping_with_verbosity_2(self):
self.run_pip.assert_called_once_with(
[
"install", "--no-index", "--find-links",
unittest.mock.ANY, "-vv", "setuptools", "pip",
unittest.mock.ANY, "-vv",
"setuptools", "pip", "six", "appdirs", "packaging", "pyparsing",
],
unittest.mock.ANY,
)
Expand All @@ -110,7 +115,8 @@ def test_bootstrapping_with_verbosity_3(self):
self.run_pip.assert_called_once_with(
[
"install", "--no-index", "--find-links",
unittest.mock.ANY, "-vvv", "setuptools", "pip",
unittest.mock.ANY, "-vvv",
"setuptools", "pip", "six", "appdirs", "packaging", "pyparsing",
],
unittest.mock.ANY,
)
Expand Down Expand Up @@ -186,8 +192,8 @@ def test_uninstall(self):

self.run_pip.assert_called_once_with(
[
"uninstall", "-y", "--disable-pip-version-check", "pip",
"setuptools",
"uninstall", "-y", "--disable-pip-version-check",
"pyparsing", "packaging", "appdirs", "six", "pip", "setuptools",
]
)

Expand All @@ -197,8 +203,8 @@ def test_uninstall_with_verbosity_1(self):

self.run_pip.assert_called_once_with(
[
"uninstall", "-y", "--disable-pip-version-check", "-v", "pip",
"setuptools",
"uninstall", "-y", "--disable-pip-version-check", "-v",
"pyparsing", "packaging", "appdirs", "six", "pip", "setuptools",
]
)

Expand All @@ -208,8 +214,8 @@ def test_uninstall_with_verbosity_2(self):

self.run_pip.assert_called_once_with(
[
"uninstall", "-y", "--disable-pip-version-check", "-vv", "pip",
"setuptools",
"uninstall", "-y", "--disable-pip-version-check", "-vv",
"pyparsing", "packaging", "appdirs", "six", "pip", "setuptools",
]
)

Expand All @@ -220,7 +226,7 @@ def test_uninstall_with_verbosity_3(self):
self.run_pip.assert_called_once_with(
[
"uninstall", "-y", "--disable-pip-version-check", "-vvv",
"pip", "setuptools",
"pyparsing", "packaging", "appdirs", "six", "pip", "setuptools",
]
)

Expand Down Expand Up @@ -260,13 +266,14 @@ def test_basic_bootstrapping(self):
self.run_pip.assert_called_once_with(
[
"install", "--no-index", "--find-links",
unittest.mock.ANY, "setuptools", "pip",
unittest.mock.ANY,
"setuptools", "pip", "six", "appdirs", "packaging", "pyparsing",
],
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):

Expand All @@ -284,8 +291,8 @@ def test_basic_uninstall(self):

self.run_pip.assert_called_once_with(
[
"uninstall", "-y", "--disable-pip-version-check", "pip",
"setuptools",
"uninstall", "-y", "--disable-pip-version-check", "pyparsing", "packaging",
"appdirs", "six", "pip", "setuptools",
]
)

Expand Down
Back | FazBrowse Home | New Git URL