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 embeded setuptools #1855

Merged
merged 2 commits into from
Jun 12, 2020
Merged

Upgrade embeded setuptools #1855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9327e07
Upgrade embeded setuptools
gaborbernat Jun 12, 2020
2dbdfd2
disable xonsh on python3.9
gaborbernat Jun 12, 2020
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/1846.bugfix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Relax ``importlib.resources`` requirement to also allow version 2 - by :user:`asottile`.
1 change: 1 addition & 0 deletions docs/changelog/1855.bugfix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Upgrade embedded setuptools to ``44.1.1`` for python 2 and ``47.1.1`` for python3.5+ - by :user:`gaborbernat`.
4 changes: 2 additions & 2 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ virtualenv.activate =
batch = virtualenv.activation.batch:BatchActivator
fish = virtualenv.activation.fish:FishActivator
powershell = virtualenv.activation.powershell:PowerShellActivator
python = virtualenv.activation.python:PythonActivator
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm getting an error that might be related to this merge. Is the change expected?

AttributeError: module 'virtualenv.activation.python' has no attribute 'PestythonActivator'

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This just broke all of my production build pipelines as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have to be honest, have no idea how this change made it in. Late Friday releases are always dangerous but wanted to get out a fix release to address peoples issues due to #1846 🤦 🤷‍♂️

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It happens. Thanks for the quick fix! @gaborbernat

python = virtualenv.activation.python:PestythonActivator
xonsh = virtualenv.activation.xonsh:XonshActivator
virtualenv.create =
venv = virtualenv.create.via_global_ref.venv:Venv
Expand Down Expand Up @@ -99,7 +99,7 @@ testing =
pytest-randomly >= 1
pytest-timeout >= 1
flaky >= 3
xonsh >= 0.9.16; python_version > '3.4'
xonsh >= 0.9.16; python_version > '3.4' and python_version != '3.9'

[options.package_data]
virtualenv.activation.bash = *.sh
Expand Down
12 changes: 6 additions & 6 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.1.1-py2.py3-none-any.whl",
"setuptools": "setuptools-46.4.0-py3-none-any.whl",
"setuptools": "setuptools-47.1.1-py3-none-any.whl",
"wheel": "wheel-0.34.2-py2.py3-none-any.whl",
},
"3.8": {
"pip": "pip-20.1.1-py2.py3-none-any.whl",
"setuptools": "setuptools-46.4.0-py3-none-any.whl",
"setuptools": "setuptools-47.1.1-py3-none-any.whl",
"wheel": "wheel-0.34.2-py2.py3-none-any.whl",
},
"3.7": {
"pip": "pip-20.1.1-py2.py3-none-any.whl",
"setuptools": "setuptools-46.4.0-py3-none-any.whl",
"setuptools": "setuptools-47.1.1-py3-none-any.whl",
"wheel": "wheel-0.34.2-py2.py3-none-any.whl",
},
"3.6": {
"pip": "pip-20.1.1-py2.py3-none-any.whl",
"setuptools": "setuptools-46.4.0-py3-none-any.whl",
"setuptools": "setuptools-47.1.1-py3-none-any.whl",
"wheel": "wheel-0.34.2-py2.py3-none-any.whl",
},
"3.5": {
"pip": "pip-20.1.1-py2.py3-none-any.whl",
"setuptools": "setuptools-46.4.0-py3-none-any.whl",
"setuptools": "setuptools-47.1.1-py3-none-any.whl",
"wheel": "wheel-0.34.2-py2.py3-none-any.whl",
},
"3.4": {
Expand All @@ -33,7 +33,7 @@
},
"2.7": {
"pip": "pip-20.1.1-py2.py3-none-any.whl",
"setuptools": "setuptools-44.1.0-py2.py3-none-any.whl",
"setuptools": "setuptools-44.1.1-py2.py3-none-any.whl",
"wheel": "wheel-0.34.2-py2.py3-none-any.whl",
},
}
Expand Down
Binary file renamed ...ls/setuptools-44.1.0-py2.py3-none-any.whl → ...ls/setuptools-44.1.1-py2.py3-none-any.whl
View file
Open in desktop
Binary file not shown.
Binary file renamed ...wheels/setuptools-46.4.0-py3-none-any.whl → ...wheels/setuptools-47.1.1-py3-none-any.whl
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions tests/unit/activation/test_xonsh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@


@pytest.mark.slow
@pytest.mark.skipif(sys.platform == "win32" and IS_PYPY and PY3, reason="xonsh on Windows blocks indefinitely")
@pytest.mark.xfail(
condition=sys.version_info[0:2] == (3, 9), strict=True, reason="https://bugs.python.org/issue40726",
@pytest.mark.skipif(
(sys.platform == "win32" and IS_PYPY and PY3) or sys.version_info[0:2] == (3, 9),
reason="xonsh on Windows blocks indefinitely and is not stable yet on 3.9",
)
def test_xonsh(activation_tester_class, activation_tester):
class Xonsh(activation_tester_class):
Expand Down