Skip to content
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

upgrade setuptools to 46.0.0 from 45.3.0 for Python3.5+ #1702

Merged
merged 1 commit into from
Mar 9, 2020
Merged

upgrade setuptools to 46.0.0 from 45.3.0 for Python3.5+ #1702

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
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/changelog/1702.bugfix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Upgrade embedded setuptools to ``46.0.0`` from ``45.3.0`` on Python ``3.5+``.
10 changes: 5 additions & 5 deletions src/virtualenv/seed/embed/wheels/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,27 @@
BUNDLE_SUPPORT = {
"3.9": {
"pip": "pip-20.0.2-py2.py3-none-any.whl",
"setuptools": "setuptools-45.3.0-py3-none-any.whl",
"setuptools": "setuptools-46.0.0-py3-none-any.whl",
"wheel": "wheel-0.34.2-py2.py3-none-any.whl",
},
"3.8": {
"pip": "pip-20.0.2-py2.py3-none-any.whl",
"setuptools": "setuptools-45.3.0-py3-none-any.whl",
"setuptools": "setuptools-46.0.0-py3-none-any.whl",
"wheel": "wheel-0.34.2-py2.py3-none-any.whl",
},
"3.7": {
"pip": "pip-20.0.2-py2.py3-none-any.whl",
"setuptools": "setuptools-45.3.0-py3-none-any.whl",
"setuptools": "setuptools-46.0.0-py3-none-any.whl",
"wheel": "wheel-0.34.2-py2.py3-none-any.whl",
},
"3.6": {
"pip": "pip-20.0.2-py2.py3-none-any.whl",
"setuptools": "setuptools-45.3.0-py3-none-any.whl",
"setuptools": "setuptools-46.0.0-py3-none-any.whl",
"wheel": "wheel-0.34.2-py2.py3-none-any.whl",
},
"3.5": {
"pip": "pip-20.0.2-py2.py3-none-any.whl",
"setuptools": "setuptools-45.3.0-py3-none-any.whl",
"setuptools": "setuptools-46.0.0-py3-none-any.whl",
"wheel": "wheel-0.34.2-py2.py3-none-any.whl",
},
"3.4": {
Expand Down
Binary file renamed ...wheels/setuptools-45.3.0-py3-none-any.whl → ...wheels/setuptools-46.0.0-py3-none-any.whl
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion tests/unit/create/test_creator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,6 @@ def test_create_long_path(current_fastest, tmp_path):


@pytest.mark.parametrize("creator", set(PythonInfo.current_system().creators().key_to_class) - {"builtin"})
@pytest.mark.timeout(timeout=30)
def test_create_distutils_cfg(creator, tmp_path, monkeypatch):
result = cli_run([ensure_text(str(tmp_path / "venv")), "--activators", "", "--creator", creator])

Expand Down
1 change: 0 additions & 1 deletion tests/unit/seed/test_extra_install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ def builtin_shows_marker_missing():
reason="Building C-Extensions requires header files with host python",
)
@pytest.mark.parametrize("creator", list(i for i in CREATOR_CLASSES.keys() if i != "builtin"))
@pytest.mark.timeout(timeout=30)
def test_can_build_c_extensions(creator, tmp_path, coverage_env):
session = cli_run(["--creator", creator, "--seed", "app-data", str(tmp_path), "-vvv"])
coverage_env()
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ commands =
python -m coverage run\
-m pytest \
--junitxml {toxworkdir}/junit.{envname}.xml \
--timeout 20 \
--timeout 30 \
tests {posargs:--int}

python -m coverage combine
Expand Down