Skip to content

Commit d622935

Browse files
committed
Restore ScriptWriter and sys_executable properties.
Fixes #4976
1 parent 88bd892 commit d622935

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

setuptools/command/easy_install.py

+9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
1+
import os
2+
import sys
3+
14
from setuptools import Command
25

6+
from .. import _scripts
7+
38

49
class easy_install(Command):
510
"""Stubbed command for temporary pbr compatibility."""
11+
12+
13+
ScriptWriter = _scripts.ScriptWriter
14+
sys_executable = os.environ.get("__PYVENV_LAUNCHER__", os.path.normpath(sys.executable))

setuptools/tests/integration/test_pbr.py

-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import subprocess
22

3-
import pytest
43

5-
6-
@pytest.mark.xfail(reason="#4976")
74
def test_pbr_integration(pbr_package, venv):
85
"""Ensure pbr packages install."""
96
cmd = [

0 commit comments

Comments
 (0)