summaryrefslogtreecommitdiff
path: root/setuptools/command
diff options
context:
space:
mode:
authorAnderson Bravalheri <andersonbravalheri@gmail.com>2023-01-24 10:52:53 +0000
committerAnderson Bravalheri <andersonbravalheri@gmail.com>2023-01-24 10:57:27 +0000
commit3736cbc2bdaef3fa4dfbdf59dac69be42bf8aa15 (patch)
treed033098087ba1afaba65936c9a6461d25c71eefe /setuptools/command
parent33f3243c8256742112bec48d1f34c61ddbfb95be (diff)
downloadpython-setuptools-git-3736cbc2bdaef3fa4dfbdf59dac69be42bf8aa15.tar.gz
Revert to using normalized paths in develop to fix test errors
Diffstat (limited to 'setuptools/command')
-rw-r--r--setuptools/command/develop.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index 08ae7f0d..5630ca4c 100644
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -63,17 +63,18 @@ class develop(namespaces.DevelopInstaller, easy_install):
if self.egg_path is None:
self.egg_path = os.path.abspath(ei.egg_base)
- egg_path = os.path.join(self.install_dir, self.egg_path)
- if not _path.same_path(egg_path, self.egg_base):
+ target = _path.normpath(self.egg_base)
+ egg_path = _path.normpath(os.path.join(self.install_dir, self.egg_path))
+ if egg_path != target:
raise DistutilsOptionError(
"--egg-path must be a relative path from the install"
- f" directory to {self.egg_base}"
+ " directory to " + target
)
# Make a distribution for the package's source
self.dist = pkg_resources.Distribution(
- self.egg_base,
- pkg_resources.PathMetadata(self.egg_base, os.path.abspath(ei.egg_info)),
+ target,
+ pkg_resources.PathMetadata(target, os.path.abspath(ei.egg_info)),
project_name=ei.egg_name,
)