From 1d0787f852ebc8ac6217c0d07445950f921142b7 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 20 Dec 2021 11:36:48 +0100 Subject: requirements: Do the Python 3.6 dance --- misc/requirements/requirements-qutebrowser.txt-raw | 5 ++++- misc/requirements/requirements-tests.txt | 6 ++++-- misc/requirements/requirements-tests.txt-raw | 6 ++++++ misc/requirements/requirements-tox.txt | 3 ++- misc/requirements/requirements-tox.txt-raw | 3 +++ requirements.txt | 3 ++- 6 files changed, 21 insertions(+), 5 deletions(-) diff --git a/misc/requirements/requirements-qutebrowser.txt-raw b/misc/requirements/requirements-qutebrowser.txt-raw index e07ea992a..9f2e369a1 100644 --- a/misc/requirements/requirements-qutebrowser.txt-raw +++ b/misc/requirements/requirements-qutebrowser.txt-raw @@ -15,6 +15,9 @@ importlib-metadata # Determining PyQt version typing_extensions # from importlib-metadata #@ markers: importlib-resources python_version<"3.9" -#@ markers: importlib-metadata python_version<"3.8" +#@ markers: importlib-metadata python_version=="3.7.*" #@ markers: typing_extensions python_version<"3.8" #@ markers: dataclasses python_version<"3.7" + +# Python 3.6 +#@ add: importlib-metadata<4.9 ; python_version=="3.6.*" diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 4a8a28d54..fa37c75a5 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -18,7 +18,7 @@ icdiff==2.0.4 idna==3.3 iniconfig==1.1.1 itsdangerous==2.0.1 -jaraco.functools==3.5.0 +jaraco.functools==3.5.0 ; python_version>="3.7" # Jinja2==3.0.3 Mako==1.1.6 manhole==1.8.0 @@ -54,7 +54,9 @@ sortedcontainers==2.4.0 soupsieve==2.3.1 tldextract==3.1.2 toml==0.10.2 -tomli==2.0.0 +tomli==2.0.0 ; python_version>="3.7" urllib3==1.26.7 vulture==2.3 Werkzeug==2.0.2 +jaraco.functools<3.5 ; python_version=="3.6.*" +tomli<2 ; python_version=="3.6.*" diff --git a/misc/requirements/requirements-tests.txt-raw b/misc/requirements/requirements-tests.txt-raw index 5586a86ef..22a50679a 100644 --- a/misc/requirements/requirements-tests.txt-raw +++ b/misc/requirements/requirements-tests.txt-raw @@ -35,3 +35,9 @@ pytest-icdiff tldextract #@ ignore: Jinja2, MarkupSafe, colorama + +# Python 3.6 +#@ markers: jaraco.functools python_version>="3.7" +#@ add: jaraco.functools<3.5 ; python_version=="3.6.*" +#@ markers: tomli python_version>="3.7" +#@ add: tomli<2 ; python_version=="3.6.*" diff --git a/misc/requirements/requirements-tox.txt b/misc/requirements/requirements-tox.txt index 150d73660..f9f9e12a2 100644 --- a/misc/requirements/requirements-tox.txt +++ b/misc/requirements/requirements-tox.txt @@ -9,9 +9,10 @@ platformdirs==2.4.0 pluggy==1.0.0 py==1.11.0 pyparsing==3.0.6 -setuptools==60.0.0 +setuptools==60.0.0 ; python_version>="3.7" six==1.16.0 toml==0.10.2 tox==3.24.4 virtualenv==20.10.0 wheel==0.37.0 +setuptools<60 ; python_version=="3.6.*" diff --git a/misc/requirements/requirements-tox.txt-raw b/misc/requirements/requirements-tox.txt-raw index 27d58e1f4..2f7f64b1f 100644 --- a/misc/requirements/requirements-tox.txt-raw +++ b/misc/requirements/requirements-tox.txt-raw @@ -1,2 +1,5 @@ tox wheel + +#@ markers: setuptools python_version>="3.7" +#@ add: setuptools<60 ; python_version=="3.6.*" diff --git a/requirements.txt b/requirements.txt index d0dafebd9..7528da7d4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ adblock==0.5.1 colorama==0.4.4 dataclasses==0.6 ; python_version<"3.7" -importlib-metadata==4.10.0 ; python_version<"3.8" +importlib-metadata==4.10.0 ; python_version=="3.7.*" importlib-resources==5.4.0 ; python_version<"3.9" Jinja2==3.0.3 MarkupSafe==2.0.1 @@ -11,3 +11,4 @@ Pygments==2.10.0 PyYAML==6.0 typing_extensions==4.0.1 ; python_version<"3.8" zipp==3.6.0 +importlib-metadata<4.9 ; python_version=="3.6.*" -- cgit v1.2.3-54-g00ecf