This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8858

packaging: include templates with their package as key in package_data
ClosedPublic

Authored by martinvonz on Jul 31 2020, 7:59 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGe2320bb7a99f: packaging: include templates with their package as key in package_data
Summary

This is similar to an earlier patch in this series. It seems more
correct to use mercurial.templates.coal etc as keys in the
package_data dict now that those modules are packages.

Diff Detail

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

Revision Contents
Changeset List

PathPackages
Msetup.py (6 lines)

Diff 22241

setup.py

def ordinarypath(p): def ordinarypath(p):
return p and p[0] != '.' and p[-1] != '~' return p and p[0] != '.' and p[-1] != '~'
for root in ('templates',): for root in ('templates',):
for curdir, dirs, files in os.walk(os.path.join('mercurial', root)): for curdir, dirs, files in os.walk(os.path.join('mercurial', root)):
curdir = curdir.split(os.sep, 1)[1] packagename = curdir.replace(os.sep, '.')
for f in filter(ordinarypath, files): packagedata[packagename] = list(filter(ordinarypath, files))
f = os.path.join(curdir, f)
packagedata['mercurial'].append(f)
datafiles = [] datafiles = []
# distutils expects version to be str/unicode. Converting it to # distutils expects version to be str/unicode. Converting it to
# unicode on Python 2 still works because it won't contain any # unicode on Python 2 still works because it won't contain any
# non-ascii bytes and will be implicitly converted back to bytes # non-ascii bytes and will be implicitly converted back to bytes
# when operated on. # when operated on.
assert isinstance(version, bytes) assert isinstance(version, bytes)