Skip to content

Commit 4cd7610

Browse files
unmadegaborbernat
authored andcommitted
Fix #1236 typos in isolated.py build method (#1235)
* Reproduce build error when pyproject defines requirements for package * Fix typos * Add changelog * Skip test for win32 and py2
1 parent de1afa2 commit 4cd7610

File tree

4 files changed

+10
-2
lines changed

4 files changed

+10
-2
lines changed

docs/changelog/1236.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fix typos in isolated.py that made it impossible to install package with requirements in pyproject.toml - by :user:`unmade`

src/tox/package/builder/isolated.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ def build(config, session):
3838
if pkg_resources.Requirement(r).key not in base_build_deps
3939
]
4040
if build_requires_dep:
41-
with package_venv.newaction("build_requires", package_venv.envconfig.envdir) as action:
41+
with package_venv.new_action("build_requires", package_venv.envconfig.envdir) as action:
4242
package_venv.run_install_command(packages=build_requires_dep, action=action)
43-
package_venv.finishvenv(package_venv)
43+
package_venv.finishvenv()
4444
return perform_isolated_build(build_info, package_venv, config.distdir, config.setupdir)
4545

4646

tests/integration/test_package_int.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ def test_package_flit(initproj, cmd):
5353
author = "Happy Harry"
5454
author-email = "[email protected]"
5555
home-page = "https://github.com/happy-harry/is"
56+
requires = [
57+
"tox",
58+
]
5659
""",
5760
".gitignore": ".tox",
5861
},

tests/integration/test_provision_int.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
from tox.util.main import MAIN_FILE
1010

1111

12+
@pytest.mark.skipif(
13+
"sys.platform == 'win32' and sys.version_info < (3,)",
14+
reason="does not run on windows with py2",
15+
)
1216
def test_provision_missing(initproj, cmd):
1317
initproj(
1418
"pkg123-0.7",

0 commit comments

Comments
 (0)