From ecd7565aff904fa857d10abb2dc3d0485a45fd03 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 19 Sep 2022 10:51:27 +0200 Subject: [PATCH] requirements: Work around limitations for macOS-specific deps Also see #3526 --- misc/requirements/requirements-qutebrowser.txt-raw | 11 +++++++---- requirements.txt | 5 +++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/misc/requirements/requirements-qutebrowser.txt-raw b/misc/requirements/requirements-qutebrowser.txt-raw index c628f528a..ab18a7caa 100644 --- a/misc/requirements/requirements-qutebrowser.txt-raw +++ b/misc/requirements/requirements-qutebrowser.txt-raw @@ -2,8 +2,13 @@ Jinja2 PyYAML ## Only used on macOS to make borderless windows resizable -pyobjc-core -pyobjc-framework-Cocoa +## our recompile_requirements.py can't really deal with +## platform-specific dependencies unfortunately... +# pyobjc-core +# pyobjc-framework-Cocoa +#@ add: # Unpinned due to recompile_requirements.py limitations +#@ add: pyobjc-core ; sys_platform=="darwin" +#@ add: pyobjc-framework-Cocoa ; sys_platform=="darwin" ## stdlib backports importlib-resources @@ -20,5 +25,3 @@ typing_extensions # from importlib-metadata #@ markers: importlib-resources python_version=="3.7.*" or python_version=="3.8.*" #@ markers: importlib-metadata python_version=="3.7.*" #@ markers: typing_extensions python_version<"3.8" -#@ markers: pyobjc-core sys_platform=="darwin" -#@ markers: pyobjc-framework-Cocoa sys_platform=="darwin" diff --git a/requirements.txt b/requirements.txt index fe6001ae4..e0ea72e0d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,8 +7,9 @@ importlib-resources==5.9.0 ; python_version=="3.7.*" or python_version=="3.8.*" Jinja2==3.1.2 MarkupSafe==2.1.1 Pygments==2.13.0 -pyobjc-core==8.5 ; sys_platform=="darwin" -pyobjc-framework-Cocoa==8.5 ; sys_platform=="darwin" PyYAML==6.0 typing_extensions==4.3.0 ; python_version<"3.8" zipp==3.8.1 +# Unpinned due to recompile_requirements.py limitations +pyobjc-core ; sys_platform=="darwin" +pyobjc-framework-Cocoa ; sys_platform=="darwin"