Merge pull request #1 from uranusjr/setupcfg_only_devinstall

This should fix the test errors
KOLANICH-tools · Feb 23, 2021 · fcada1f · fcada1f
2 parents 0655f47 + 0d24994
commit fcada1f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/src/pip/_internal/req/constructors.py b/src/pip/_internal/req/constructors.py
@@ -82,11 +82,9 @@ def parse_editable(editable_req):
     url_no_extras, extras = _strip_extras(url)
 
     if os.path.isdir(url_no_extras):
-        if (
-            not os.path.exists(os.path.join(url_no_extras, 'setup.py'))
-            and
-            not os.path.exists(os.path.join(url_no_extras, 'setup.cfg'))
-           ):
+        setup_py = os.path.join(url_no_extras, 'setup.py')
+        setup_cfg = os.path.join(url_no_extras, 'setup.cfg')
+        if not os.path.exists(setup_py) and not os.path.exists(setup_cfg):
             msg = (
                 'File "setup.py" or "setup.cfg" not found. Directory cannot be '
                 'installed in editable mode: {}'
@@ -96,8 +94,7 @@ def parse_editable(editable_req):
             if os.path.isfile(pyproject_path):
                 msg += (
                     '\n(A "pyproject.toml" file was found, but editable '
-                    'mode currently requires a setuptools-based build'
-                    ' ("setup.py" or "setup.cfg" or both).)'
+                    'mode currently requires a setuptools-based build.)'
                 )
             raise InstallationError(msg)
 

diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
@@ -1070,19 +1070,19 @@ def test_install_editable_with_prefix_setup_cfg(script):
 """
     pyproject_toml = """[build-system]
 requires = ["setuptools", "wheel"]
-build-backend = "setuptools.build_meta
+build-backend = "setuptools.build_meta"
 """
     _test_install_editable_with_prefix(
         script, {"setup.cfg": setup_cfg, "pyproject.toml": pyproject_toml}
     )
 
 
 def test_install_editable_with_prefix(script):
-    _test_install_editable_with_prefix(script, """
-        from setuptools import setup
-        setup(name='pkga',
-              version='0.1')
-    """)
+    setup_py = """
+from setuptools import setup
+setup(name='pkga', version='0.1')
+"""
+    _test_install_editable_with_prefix(script, {"setup.py": setup_py})
 
 
 def test_install_package_conflict_prefix_and_user(script, data):