From 3736cbc2bdaef3fa4dfbdf59dac69be42bf8aa15 Mon Sep 17 00:00:00 2001 From: Anderson Bravalheri Date: Tue, 24 Jan 2023 10:52:53 +0000 Subject: [PATCH] Revert to using normalized paths in develop to fix test errors --- setuptools/command/develop.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py index 08ae7f0df3..5630ca4cdc 100644 --- a/setuptools/command/develop.py +++ b/setuptools/command/develop.py @@ -63,17 +63,18 @@ def finalize_options(self): 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, )