From fa232daa10672b0dad797f21af65c5861069cf19 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Mon, 21 Feb 2022 21:03:48 +1300 Subject: try to pin markupsafe for 3.6 Hopefully that works. This was confusing. Grepping for 3.6 to see how other places pin it there were a bunch of normal pins in .txt files and then some comment-but-actually-instruction comments in the -raw files. There is a readme in the requirements folder but it just says what instructions are allowed. Not why you would want to add them, seems to very high cognitive load setup. Trying to run the recompile_requirements.py script it did some stuff then quit because it couldn't find python3.7. Yeah I don't have that installed. It doesn't try to use pyenv or anything, just runs venv expecting you have everything installed? Turns out you take the name of the requirements file you added the instructions to (eq requirements-test.txt-raw -> test) and run it with that as argument. The requirements file you modify should be the highest level one that mentions the requirement you want to pin. Anyway I edited the qutebrowser.text-raw one because that seems like the main one and it mentions MarkupSafe (because of jinja2?) and ran `scripts/dev/recompile_requirements qutebrowser` in my existing venv. Lets see what the CI thinks. Also got lots of `pkg_resources==0.0.0` in a bunch of requirements files which seems problematic. --- misc/requirements/requirements-qutebrowser.txt-raw | 2 ++ requirements.txt | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/misc/requirements/requirements-qutebrowser.txt-raw b/misc/requirements/requirements-qutebrowser.txt-raw index 139d599f8..63ac32f86 100644 --- a/misc/requirements/requirements-qutebrowser.txt-raw +++ b/misc/requirements/requirements-qutebrowser.txt-raw @@ -23,3 +23,5 @@ typing_extensions # from importlib-metadata #@ add: importlib-metadata<4.9 ; python_version=="3.6.*" #@ markers: zipp python_version>="3.7" #@ add: zipp<3.7 ; python_version=="3.6.*" +#@ markers: MarkupSafe python_version>="3.7" +#@ add: MarkupSafe<2.1.0 ; python_version=="3.6.*" diff --git a/requirements.txt b/requirements.txt index 77c5602f3..6617f6a5f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,10 +6,11 @@ dataclasses==0.6 ; python_version<"3.7" importlib-metadata==4.11.1 ; python_version=="3.7.*" importlib-resources==5.4.0 ; python_version<"3.9" Jinja2==3.0.3 -MarkupSafe==2.1.0 +MarkupSafe==2.1.0 ; python_version>="3.7" Pygments==2.11.2 PyYAML==6.0 typing_extensions==4.1.1 ; python_version<"3.8" zipp==3.7.0 ; python_version>="3.7" importlib-metadata<4.9 ; python_version=="3.6.*" zipp<3.7 ; python_version=="3.6.*" +MarkupSafe<2.1.0 ; python_version=="3.6.*" -- cgit v1.2.3-54-g00ecf