This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7875

packaging: leverage os.path.relpath() in setup.py
ClosedPublic

Authored by martinvonz on Jan 14 2020, 5:18 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG4e05272dd681: packaging: leverage os.path.relpath() in setup.py
Summary

os.path.relpath() has existed since Python 2.6, so we can safely use
it. This fixes a bug in the current code when the common prefix is "/"
(in which case uplevel would be one less than it should).

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Jan 14 2020, 5:18 PM
pulkit accepted this revision.Jan 15 2020, 7:16 AM
This revision is now accepted and ready to land.Jan 15 2020, 7:16 AM
martinvonz added a commit: rHG4e05272dd681: packaging: leverage os.path.relpath() in setup.py.Jan 15 2020, 8:17 AM
Closed by commit rHG4e05272dd681: packaging: leverage os.path.relpath() in setup.py (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Msetup.py (6 lines)

Diff 19268

setup.py

if ( if (
os.path.splitdrive(self.install_dir)[0] os.path.splitdrive(self.install_dir)[0]
!= os.path.splitdrive(self.install_lib)[0] != os.path.splitdrive(self.install_lib)[0]
): ):
# can't make relative paths from one drive to another, so use an # can't make relative paths from one drive to another, so use an
# absolute path instead # absolute path instead
libdir = self.install_lib libdir = self.install_lib
else: else:
common = os.path.commonprefix((self.install_dir, self.install_lib)) libdir = os.path.relpath(self.install_lib, self.install_dir)
rest = self.install_dir[len(common) :]
uplevel = len([n for n in os.path.split(rest) if n])
libdir = uplevel * ('..' + os.sep) + self.install_lib[len(common) :]
for outfile in self.outfiles: for outfile in self.outfiles:
with open(outfile, 'rb') as fp: with open(outfile, 'rb') as fp:
data = fp.read() data = fp.read()
# skip binary files # skip binary files
if b'\0' in data: if b'\0' in data:
continue continue