From 38614ab0477ca99505877b18c68d905fd2f17daf Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Wed, 23 Dec 2020 20:27:31 +1000 Subject: [PATCH] winrt 1.0.20239.1 isn't available for python 3.9 --- pip/requirements.in | 4 ++-- pip/requirements.txt | 7 +++++-- qt/aqt/BUILD.bazel | 3 ++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pip/requirements.in b/pip/requirements.in index 72af7bc87..c68cfdd8e 100644 --- a/pip/requirements.in +++ b/pip/requirements.in @@ -26,8 +26,8 @@ fluent-syntax psutil; sys.platform == "win32" pywin32; sys.platform == "win32" # pinned due to https://github.com/microsoft/xlang/issues/717 -# the latest version apparently works on python3.9 -winrt==1.0.20239.1; sys.platform == "win32" and platform_release == "10" +winrt==1.0.20239.1; sys.platform == "win32" and platform_release == "10" and python_version == "3.8" +winrt; sys.platform == "win32" and platform_release == "10" and python_version >= "3.9" # transitive windows dependencies atomicwrites; sys.platform == "win32" # via pytest diff --git a/pip/requirements.txt b/pip/requirements.txt index eddaa4008..51d1ce444 100644 --- a/pip/requirements.txt +++ b/pip/requirements.txt @@ -55,9 +55,12 @@ typing-extensions==3.7.4.3 # via black, mypy urllib3==1.26.2 # via requests waitress==2.0.0b1 # via -r requirements.in werkzeug==1.0.1 # via flask -winrt==1.0.20239.1 ; sys_platform == "win32" and platform_release == "10" # via -r requirements.in +winrt==1.0.20239.1 ; sys_platform == "win32" and platform_release == "10" and python_version == "3.8" # via -r requirements.in wrapt==1.12.1 # via astroid # The following packages are considered to be unsafe in a requirements file: pip==20.3.3 # via pip-tools -setuptools==51.1.0.post20201221 # via jsonschema +setuptools==51.1.0 # via jsonschema + +# manually added for now; ensure it and the earlier winrt are not removed on update +winrt==1.0.20330.1; sys.platform == "win32" and platform_release == "10" and python_version >= "3.9" diff --git a/qt/aqt/BUILD.bazel b/qt/aqt/BUILD.bazel index ad75b8f39..7bfa5f261 100644 --- a/qt/aqt/BUILD.bazel +++ b/qt/aqt/BUILD.bazel @@ -113,7 +113,8 @@ py_wheel( "pyqtwebengine", 'psutil; sys.platform == "win32"', 'pywin32; sys.platform == "win32"', - 'winrt==1.0.20239.1 ; sys_platform == "win32" and platform_release == "10"', + 'winrt==1.0.20239.1; sys.platform == "win32" and platform_release == "10" and python_version == "3.8"', + 'winrt; sys.platform == "win32" and platform_release == "10" and python_version >= "3.9"', "anki==" + anki_version, ], strip_path_prefixes = [