From 39cdf5382d6b7ab09a1a53e140c6d3c3854a458a Mon Sep 17 00:00:00 2001 From: ch3ll Date: Fri, 13 Mar 2020 18:52:08 -0400 Subject: [PATCH] Include _version.py if building wheel --- setup.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index cde28884835..207a37f2704 100755 --- a/setup.py +++ b/setup.py @@ -679,11 +679,16 @@ class Build(build): def run(self): # Run build.run function build.run(self) + salt_build_ver_file = os.path.join(self.build_lib, 'salt', '_version.py') + if getattr(self.distribution, 'with_salt_version', False): # Write the hardcoded salt version module salt/_version.py - self.distribution.salt_version_hardcoded_path = os.path.join( - self.build_lib, 'salt', '_version.py' - ) + self.distribution.salt_version_hardcoded_path = salt_build_ver_file + self.run_command('write_salt_version') + + if getattr(self.distribution, 'build_wheel', False): + # we are building a wheel package. need to include _version.py + self.distribution.salt_version_hardcoded_path = salt_build_ver_file self.run_command('write_salt_version') if getattr(self.distribution, 'running_salt_install', False): @@ -1224,6 +1229,9 @@ class SaltDistribution(distutils.dist.Distribution): if not self.ssh_packaging and PACKAGED_FOR_SALT_SSH: self.ssh_packaging = 1 + if 'bdist_wheel' in sys.argv: + self.build_wheel = True + if self.ssh_packaging: self.metadata.name = 'salt-ssh' self.salt_transport = 'ssh'