From fb0aa8f926345d17f6fbe682ea909dedb8083675 Mon Sep 17 00:00:00 2001 From: DavHau Date: Wed, 16 Sep 2020 11:16:03 +0700 Subject: [PATCH] fix: wheels with multiple python versions in filename (pyqt5) --- mach_nix/data/providers.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mach_nix/data/providers.py b/mach_nix/data/providers.py index 59c491d..dc42f21 100644 --- a/mach_nix/data/providers.py +++ b/mach_nix/data/providers.py @@ -276,19 +276,19 @@ class WheelDependencyProvider(DependencyProviderBase): if self.system == "linux": cp_abi = f"cp{maj}{min}mu" if int(maj) == 2 else f"cp{maj}{min}m?" self.preferred_wheels = ( - re.compile(rf"(py{maj}|cp{maj}){min}?-({cp_abi}|abi3|none)-manylinux2014_{self.platform}"), - re.compile(rf"(py{maj}|cp{maj}){min}?-({cp_abi}|abi3|none)-manylinux2010_{self.platform}"), - re.compile(rf"(py{maj}|cp{maj}){min}?-({cp_abi}|abi3|none)-manylinux1_{self.platform}"), - re.compile(rf"(py{maj}|cp{maj}){min}?-({cp_abi}|abi3|none)-linux_{self.platform}"), - re.compile(rf"(py{maj}|cp{maj}){min}?-({cp_abi}|abi3|none)-any"), + re.compile(rf".*(py{maj}|cp{maj}){min}?.*-({cp_abi}|abi3|none)-manylinux2014_{self.platform}"), + re.compile(rf".*(py{maj}|cp{maj}){min}?.*-({cp_abi}|abi3|none)-manylinux2010_{self.platform}"), + re.compile(rf".*(py{maj}|cp{maj}){min}?.*-({cp_abi}|abi3|none)-manylinux1_{self.platform}"), + re.compile(rf".*(py{maj}|cp{maj}){min}?.*-({cp_abi}|abi3|none)-linux_{self.platform}"), + re.compile(rf".*(py{maj}|cp{maj}){min}?.*-({cp_abi}|abi3|none)-any"), ) elif self.system == "darwin": self.preferred_wheels = ( - re.compile(rf"(py{maj}|cp{maj}){min}?-(cp{maj}{min}|abi3|none)-macosx_\d*_\d*_universal"), - re.compile(rf"(py{maj}|cp{maj}){min}?-(cp{maj}{min}|abi3|none)-macosx_\d*_\d*_x86_64"), - re.compile(rf"(py{maj}|cp{maj}){min}?-(cp{maj}{min}|abi3|none)-macosx_\d*_\d*_intel"), - re.compile(rf"(py{maj}|cp{maj}){min}?-(cp{maj}{min}|abi3|none)-macosx_\d*_\d*_(fat64|fat32)"), - re.compile(rf"(py{maj}|cp{maj}){min}?-(cp{maj}{min}|abi3|none)-any"),) + re.compile(rf".*(py{maj}|cp{maj}){min}?.*-(cp{maj}{min}|abi3|none)-macosx_\d*_\d*_universal"), + re.compile(rf".*(py{maj}|cp{maj}){min}?.*-(cp{maj}{min}|abi3|none)-macosx_\d*_\d*_x86_64"), + re.compile(rf".*(py{maj}|cp{maj}){min}?.*-(cp{maj}{min}|abi3|none)-macosx_\d*_\d*_intel"), + re.compile(rf".*(py{maj}|cp{maj}){min}?.*-(cp{maj}{min}|abi3|none)-macosx_\d*_\d*_(fat64|fat32)"), + re.compile(rf".*(py{maj}|cp{maj}){min}?.*-(cp{maj}{min}|abi3|none)-any"),) else: raise Exception(f"Unsupported Platform {platform.system()}")