From 64982f8b14ca7a165a4f4d0007c52a214c0d92dc Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 20 Aug 2019 13:21:29 +0200 Subject: [PATCH] makepanda: makepackage/makewheel take default version from setup.cfg dtool/PandaVersion.pp is obsolete and will be removed soon. --- makepanda/makepackage.py | 2 +- makepanda/makewheel.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/makepanda/makepackage.py b/makepanda/makepackage.py index 1094609374..6c9d01cfff 100755 --- a/makepanda/makepackage.py +++ b/makepanda/makepackage.py @@ -1039,7 +1039,7 @@ def MakeInstaller(version, **kwargs): if __name__ == "__main__": - version = ParsePandaVersion("dtool/PandaVersion.pp") + version = GetMetadataValue('version') parser = OptionParser() parser.add_option('', '--version', dest='version', help='Panda3D version number (default: %s)' % (version), default=version) diff --git a/makepanda/makewheel.py b/makepanda/makewheel.py index f9b8bb1bec..42f2eca5ef 100644 --- a/makepanda/makewheel.py +++ b/makepanda/makewheel.py @@ -15,7 +15,7 @@ import tempfile import subprocess from distutils.sysconfig import get_config_var from optparse import OptionParser -from makepandacore import ColorText, LocateBinary, ParsePandaVersion, GetExtensionSuffix, SetVerbose, GetVerbose, GetMetadataValue +from makepandacore import ColorText, LocateBinary, GetExtensionSuffix, SetVerbose, GetVerbose, GetMetadataValue from base64 import urlsafe_b64encode @@ -717,7 +717,7 @@ __version__ = '{0}' if __name__ == "__main__": - version = ParsePandaVersion("dtool/PandaVersion.pp") + version = GetMetadataValue('version') parser = OptionParser() parser.add_option('', '--version', dest = 'version', help = 'Panda3D version number (default: %s)' % (version), default = version)