From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web12.27221.1577412325607967574 for ; Thu, 26 Dec 2019 18:05:25 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: nathaniel.l.desimone@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Dec 2019 18:05:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,361,1571727600"; d="scan'208";a="219994405" Received: from jlendah-mobl1.amr.corp.intel.com ([10.254.188.175]) by orsmga006.jf.intel.com with ESMTP; 26 Dec 2019 18:05:24 -0800 From: "Nate DeSimone" To: devel@edk2.groups.io Cc: Nate DeSimone , Ashley DeSimone , Puja Pandya , Erik Bjorge , Bret Barkelew Subject: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Fix PYTHON_VERSION usage Date: Thu, 26 Dec 2019 18:05:21 -0800 Message-Id: <20191227020521.9149-1-nathaniel.l.desimone@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Nate DeSimone PYTHON_VERSION in set_version_and_build_wheels.py is only being used for Windows right now. This patch adds Linux support. Cc: Ashley DeSimone Cc: Puja Pandya Cc: Erik Bjorge Cc: Bret Barkelew Signed-off-by: Nate DeSimone --- build-scripts/set_version_and_build_wheels.py | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/build-scripts/set_version_and_build_wheels.py b/build-scripts/set_version_and_build_wheels.py index 6fd5ab5..6d5b8d0 100755 --- a/build-scripts/set_version_and_build_wheels.py +++ b/build-scripts/set_version_and_build_wheels.py @@ -18,7 +18,7 @@ import re from subprocess import call, check_call from xml.etree import ElementTree -PYTHON_VERSION="-3" +PYTHON_VERSION="3" # # Environment detection @@ -38,13 +38,13 @@ elif os.name == "posix": else: raise EnvironmentError("Unsupported OS") -setup_py_version_data = re.compile("\s*version='([\d.]+)',") -assembly_file_version_data = re.compile("\s*\[\s*assembly:\s*AssemblyFileVersion\s*\(\"([\d.]+)\"\)\s*\]") -version_number_data = re.compile("(\d+)\.(\d+)\.(\d+)\.(\d+)") -file_version_data = re.compile("FILEVERSION\s*(\d+),\s*(\d+),\s*(\d+),\s*(\d+)") -product_version_data = re.compile("PRODUCTVERSION\s*(\d+),\s*(\d+),\s*(\d+),\s*(\d+)") -file_version_string_data = re.compile("\s*VALUE\s*\"FileVersion\"\s*,\s*\"([\d.]+)\"") -product_version_string_data = re.compile("\s*VALUE\s*\"ProductVersion\"\s*,\s*\"([\d.]+)\"") +setup_py_version_data = re.compile(r"\s*version='([\d.]+)',") +assembly_file_version_data = re.compile(r"\s*\[\s*assembly:\s*AssemblyFileVersion\s*\(\"([\d.]+)\"\)\s*\]") +version_number_data = re.compile(r"(\d+)\.(\d+)\.(\d+)\.(\d+)") +file_version_data = re.compile(r"FILEVERSION\s*(\d+),\s*(\d+),\s*(\d+),\s*(\d+)") +product_version_data = re.compile(r"PRODUCTVERSION\s*(\d+),\s*(\d+),\s*(\d+),\s*(\d+)") +file_version_string_data = re.compile(r"\s*VALUE\s*\"FileVersion\"\s*,\s*\"([\d.]+)\"") +product_version_string_data = re.compile(r"\s*VALUE\s*\"ProductVersion\"\s*,\s*\"([\d.]+)\"") wheel_package = re.compile("^([^-]+)-") def get_current_version_number(): @@ -77,7 +77,7 @@ def set_version_number_setup_py(package_version): def set_version_number_assembly_info(version): assembly_info_files = [] - for root, dirnames, filenames in os.walk(".."): + for root, _, filenames in os.walk(".."): for filename in filenames: if fnmatch.fnmatch(filename, "AssemblyInfo.cs"): assembly_info_files.append(os.path.join(root, filename)) @@ -113,11 +113,11 @@ def _set_version_number_and_wheels_cr_tools_installer_config(package_version, wh present_wheels.append(found_wheel[0]) for found_wheel in wheels: if found_wheel[0] not in present_wheels: - new_element = ElementTree.SubElement(py_version, "Wheel", - {"Name": found_wheel[0], - "Path": found_wheel[1], - "Version": package_version, - "UninstallAllOtherCopies": "false"}) + ElementTree.SubElement(py_version, "Wheel", + {"Name": found_wheel[0], + "Path": found_wheel[1], + "Version": package_version, + "UninstallAllOtherCopies": "false"}) elif root_element.tag == "Python": py_version = root_element present_wheels = [] @@ -130,11 +130,11 @@ def _set_version_number_and_wheels_cr_tools_installer_config(package_version, wh present_wheels.append(found_wheel[0]) for found_wheel in wheels: if found_wheel[0] not in present_wheels: - new_element = ElementTree.SubElement(py_version, "Wheel", - {"Name": found_wheel[0], - "Path": found_wheel[1], - "Version": package_version, - "UninstallAllOtherCopies": "false"}) + ElementTree.SubElement(py_version, "Wheel", + {"Name": found_wheel[0], + "Path": found_wheel[1], + "Version": package_version, + "UninstallAllOtherCopies": "false"}) tree.write(file_path) print("Installer config regenerated successfully") @@ -199,16 +199,16 @@ def build_wheels(extension_pkgs): dir_path = os.path.dirname(os.path.abspath(os.path.dirname(__file__))) file_path = os.path.join(dir_path, "setup.py") if ostype == WIN: - check_call("py {} \"{}\" bdist_wheel".format(PYTHON_VERSION, file_path), shell=True, cwd=dir_path) + check_call("py -{} \"{}\" bdist_wheel".format(PYTHON_VERSION, file_path), shell=True, cwd=dir_path) else: - check_call('python3 "{}" bdist_wheel'.format(file_path), shell=True, cwd=dir_path) + check_call('python{} "{}" bdist_wheel'.format(PYTHON_VERSION, file_path), shell=True, cwd=dir_path) for pkg in extension_pkgs: ext_dir_path = os.path.abspath(pkg) ext_file_path = os.path.join(ext_dir_path, 'setup.py') if ostype == WIN: - check_call("py {} \"{}\" bdist_wheel".format(PYTHON_VERSION, ext_file_path), shell=True, cwd=ext_dir_path) + check_call("py -{} \"{}\" bdist_wheel".format(PYTHON_VERSION, ext_file_path), shell=True, cwd=ext_dir_path) else: - check_call('python3 "{}" bdist_wheel'.format(ext_file_path), shell=True, cwd=ext_dir_path) + check_call('python{} "{}" bdist_wheel'.format(PYTHON_VERSION, ext_file_path), shell=True, cwd=ext_dir_path) print("Wheels built successfully") def copy_wheels_and_set_xml(package_version, extension_pkgs): -- 2.20.1