From cd4429db25746acbec3ef434935959d0f5f66224 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Mon, 4 Apr 2022 11:00:51 +1200
Subject: Remove 3.6 pins from requirements files.

Then regenerate the relevant files.
Also drop dataclasses from requirements files.
TODO: should we drop the dataclasses-types requirement for mypy too?
---
 misc/requirements/requirements-pylint.txt          |  3 +-
 misc/requirements/requirements-pylint.txt-raw      |  4 --
 misc/requirements/requirements-qutebrowser.txt-raw | 13 -------
 misc/requirements/requirements-tests.txt           | 45 ++++++++--------------
 misc/requirements/requirements-tests.txt-raw       | 32 ---------------
 misc/requirements/requirements-tox.txt             | 12 ++----
 misc/requirements/requirements-tox.txt-raw         | 10 -----
 qutebrowser/misc/earlyinit.py                      |  1 -
 requirements.txt                                   | 12 ++----
 scripts/dev/changelog_urls.json                    |  1 -
 10 files changed, 23 insertions(+), 110 deletions(-)

diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt
index 3e5ebea9e..3df5e6a5c 100644
--- a/misc/requirements/requirements-pylint.txt
+++ b/misc/requirements/requirements-pylint.txt
@@ -13,7 +13,7 @@ isort==5.10.1
 lazy-object-proxy==1.7.1
 mccabe==0.7.0
 pefile==2021.9.3
-platformdirs==2.5.1 ; python_version>="3.7"
+platformdirs==2.5.1
 pycparser==2.21
 PyJWT==2.3.0
 pylint==2.13.3
@@ -27,4 +27,3 @@ typing_extensions==4.1.1
 uritemplate==4.1.1
 # urllib3==1.26.9
 wrapt==1.14.0
-platformdirs==2.4.0 ; python_version=="3.6.*"
diff --git a/misc/requirements/requirements-pylint.txt-raw b/misc/requirements/requirements-pylint.txt-raw
index 52633ec1a..54e12a02a 100644
--- a/misc/requirements/requirements-pylint.txt-raw
+++ b/misc/requirements/requirements-pylint.txt-raw
@@ -10,7 +10,3 @@ pefile
 
 # Already included via test requirements
 #@ ignore: urllib3
-
-# Python 3.6
-#@ markers: platformdirs python_version>="3.7"
-#@ add: platformdirs==2.4.0 ; python_version=="3.6.*"
diff --git a/misc/requirements/requirements-qutebrowser.txt-raw b/misc/requirements/requirements-qutebrowser.txt-raw
index b260fa16c..2025280fc 100644
--- a/misc/requirements/requirements-qutebrowser.txt-raw
+++ b/misc/requirements/requirements-qutebrowser.txt-raw
@@ -3,7 +3,6 @@ PyYAML
 
 ## stdlib backports
 importlib-resources
-dataclasses
 
 ## Optional dependencies
 Pygments  # For :view-source --pygments or on QtWebKit
@@ -17,15 +16,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: dataclasses python_version<"3.7"
-
-# Python 3.6
-#@ add: importlib-resources<5.6.0 ; python_version=="3.6.*"
-#@ 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.*"
-#@ markers: Jinja2 python_version>="3.7"
-#@ add: Jinja2<3.1.0 ; python_version=="3.6.*"
diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 787d2791b..4ba82712c 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -5,22 +5,22 @@ beautifulsoup4==4.10.0
 certifi==2021.10.8
 charset-normalizer==2.0.12
 cheroot==8.6.0
-click==8.1.0 ; python_version>="3.7"
-coverage==6.3.2 ; python_version>="3.7"
+click==8.1.0
+coverage==6.3.2
 execnet==1.9.0
-filelock==3.6.0 ; python_version>="3.7"
-Flask==2.1.0 ; python_version>="3.7"
+filelock==3.6.0
+Flask==2.1.0
 glob2==0.7
 hunter==3.4.3
-hypothesis==6.40.0 ; python_version>="3.7"
+hypothesis==6.40.0
 icdiff==2.0.4
 idna==3.3
-importlib-metadata==4.11.3 ; python_version=="3.7.*"
+importlib-metadata==4.11.3
 iniconfig==1.1.1
-itsdangerous==2.1.2 ; python_version>="3.7"
-jaraco.functools==3.5.0 ; python_version>="3.7"
+itsdangerous==2.1.2
+jaraco.functools==3.5.0
 # Jinja2==3.1.1
-Mako==1.2.0 ; python_version>="3.7"
+Mako==1.2.0
 manhole==1.8.0
 # MarkupSafe==2.1.1
 more-itertools==8.12.0
@@ -33,14 +33,14 @@ py==1.11.0
 py-cpuinfo==8.0.0
 Pygments==2.11.2
 pyparsing==3.0.7
-pytest==7.1.1 ; python_version>="3.7"
+pytest==7.1.1
 pytest-bdd==4.1.0
 pytest-benchmark==3.4.1
 pytest-cov==3.0.0
 pytest-forked==1.4.0
 pytest-icdiff==0.5
 pytest-instafail==0.4.2
-pytest-mock==3.7.0 ; python_version>="3.7"
+pytest-mock==3.7.0
 pytest-qt==4.0.2
 pytest-repeat==0.9.1
 pytest-rerunfailures==10.2
@@ -52,25 +52,10 @@ requests-file==1.5.1
 six==1.16.0
 sortedcontainers==2.4.0
 soupsieve==2.3.1
-tldextract==3.2.0 ; python_version>="3.7"
+tldextract==3.2.0
 toml==0.10.2
-tomli==2.0.1 ; python_version>="3.7"
+tomli==2.0.1
 urllib3==1.26.9
 vulture==2.3
-Werkzeug==2.1.0 ; python_version>="3.7"
-zipp==3.7.0 ; python_version>="3.7"
-jaraco.functools<3.5 ; python_version=="3.6.*"
-tomli<2 ; python_version=="3.6.*"
-filelock==3.4.1 ; python_version=="3.6.*"
-hypothesis<6.32 ; python_version=="3.6.*"
-coverage<6.3 ; python_version=="3.6.*"
-pytest-mock<3.7 ; python_version=="3.6.*"
-itsdangerous<2.1.0 ; python_version=="3.6.*"
-tldextract<3.2.0 ; python_version=="3.6.*"
-Mako<1.2.0 ; python_version=="3.6.*"
-pytest<7.1.0 ; python_version=="3.6.*"
-click<8.1.0 ; python_version=="3.6.*"
-Flask<2.1.0 ; python_version=="3.6.*"
-Werkzeug<2.1.0 ; python_version=="3.6.*"
-zipp<3.7 ; python_version=="3.6.*"
-importlib-metadata<4.9 ; python_version=="3.6.*"
+Werkzeug==2.1.0
+zipp==3.7.0
diff --git a/misc/requirements/requirements-tests.txt-raw b/misc/requirements/requirements-tests.txt-raw
index 6338a1a97..5586a86ef 100644
--- a/misc/requirements/requirements-tests.txt-raw
+++ b/misc/requirements/requirements-tests.txt-raw
@@ -35,35 +35,3 @@ 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.*"
-#@ markers: filelock python_version>="3.7"
-#@ add: filelock==3.4.1 ; python_version=="3.6.*"
-#@ markers: hypothesis python_version>="3.7"
-#@ add: hypothesis<6.32 ; python_version=="3.6.*"
-#@ markers: coverage python_version>="3.7"
-#@ add: coverage<6.3 ; python_version=="3.6.*"
-#@ markers: pytest-mock python_version>="3.7"
-#@ add: pytest-mock<3.7 ; python_version=="3.6.*"
-#@ markers: itsdangerous python_version>="3.7"
-#@ add: itsdangerous<2.1.0 ; python_version=="3.6.*"
-#@ markers: tldextract python_version>="3.7"
-#@ add: tldextract<3.2.0 ; python_version=="3.6.*"
-#@ markers: Mako python_version>="3.7"
-#@ add: Mako<1.2.0 ; python_version=="3.6.*"
-#@ markers: pytest python_version>="3.7"
-#@ add: pytest<7.1.0 ; python_version=="3.6.*"
-#@ markers: click python_version>="3.7"
-#@ add: click<8.1.0 ; python_version=="3.6.*"
-#@ markers: Flask python_version>="3.7"
-#@ add: Flask<2.1.0 ; python_version=="3.6.*"
-#@ markers: Werkzeug python_version>="3.7"
-#@ add: Werkzeug<2.1.0 ; python_version=="3.6.*"
-#@ markers: zipp python_version>="3.7"
-#@ add: zipp<3.7 ; python_version=="3.6.*"
-#@ markers: importlib-metadata python_version=="3.7.*"
-#@ add: importlib-metadata<4.9 ; python_version=="3.6.*"
diff --git a/misc/requirements/requirements-tox.txt b/misc/requirements/requirements-tox.txt
index a87519740..cdc49ff7f 100644
--- a/misc/requirements/requirements-tox.txt
+++ b/misc/requirements/requirements-tox.txt
@@ -1,20 +1,16 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
 distlib==0.3.4
-filelock==3.6.0 ; python_version>="3.7"
+filelock==3.6.0
 packaging==21.3
-pip==22.0.4 ; python_version>="3.7"
-platformdirs==2.5.1 ; python_version>="3.7"
+pip==22.0.4
+platformdirs==2.5.1
 pluggy==1.0.0
 py==1.11.0
 pyparsing==3.0.7
-setuptools==61.2.0 ; python_version>="3.7"
+setuptools==61.2.0
 six==1.16.0
 toml==0.10.2
 tox==3.24.5
 virtualenv==20.14.0
 wheel==0.37.1
-setuptools<60 ; python_version=="3.6.*"
-filelock==3.4.1 ; python_version=="3.6.*"
-platformdirs==2.4.0 ; python_version=="3.6.*"
-pip==21.3.1 ; python_version=="3.6.*"
diff --git a/misc/requirements/requirements-tox.txt-raw b/misc/requirements/requirements-tox.txt-raw
index 2a9f30c5a..27d58e1f4 100644
--- a/misc/requirements/requirements-tox.txt-raw
+++ b/misc/requirements/requirements-tox.txt-raw
@@ -1,12 +1,2 @@
 tox
 wheel
-
-# Python 3.6
-#@ markers: setuptools python_version>="3.7"
-#@ add: setuptools<60 ; python_version=="3.6.*"
-#@ markers: filelock python_version>="3.7"
-#@ add: filelock==3.4.1 ; python_version=="3.6.*"
-#@ markers: platformdirs python_version>="3.7"
-#@ add: platformdirs==2.4.0 ; python_version=="3.6.*"
-#@ markers: pip python_version>="3.7"
-#@ add: pip==21.3.1 ; python_version=="3.6.*"
diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py
index 45266fd40..4b3df4db2 100644
--- a/qutebrowser/misc/earlyinit.py
+++ b/qutebrowser/misc/earlyinit.py
@@ -235,7 +235,6 @@ def check_libraries():
     modules = {
         'jinja2': _missing_str("jinja2"),
         'yaml': _missing_str("PyYAML"),
-        'dataclasses': _missing_str("dataclasses"),
         'PyQt5.QtQml': _missing_str("PyQt5.QtQml"),
         'PyQt5.QtSql': _missing_str("PyQt5.QtSql"),
         'PyQt5.QtOpenGL': _missing_str("PyQt5.QtOpenGL"),
diff --git a/requirements.txt b/requirements.txt
index 25c1bd98f..b7ba35e6f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,17 +2,11 @@
 
 adblock==0.5.2
 colorama==0.4.4
-dataclasses==0.6 ; python_version<"3.7"
 importlib-metadata==4.11.3 ; python_version=="3.7.*"
 importlib-resources==5.6.0 ; python_version=="3.7.*" or python_version=="3.8.*"
-Jinja2==3.1.1 ; python_version>="3.7"
-MarkupSafe==2.1.1 ; python_version>="3.7"
+Jinja2==3.1.1
+MarkupSafe==2.1.1
 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-resources<5.6.0 ; python_version=="3.6.*"
-importlib-metadata<4.9 ; python_version=="3.6.*"
-zipp<3.7 ; python_version=="3.6.*"
-MarkupSafe<2.1.0 ; python_version=="3.6.*"
-Jinja2<3.1.0 ; python_version=="3.6.*"
+zipp==3.7.0
diff --git a/scripts/dev/changelog_urls.json b/scripts/dev/changelog_urls.json
index 0de1d68d9..f4f82ea58 100644
--- a/scripts/dev/changelog_urls.json
+++ b/scripts/dev/changelog_urls.json
@@ -140,7 +140,6 @@
   "importlib-resources": "https://importlib-resources.readthedocs.io/en/latest/history.html",
   "importlib-metadata": "https://github.com/python/importlib_metadata/blob/main/CHANGES.rst",
   "zipp": "https://github.com/jaraco/zipp/blob/main/CHANGES.rst",
-  "dataclasses": "https://github.com/ericvsmith/dataclasses#release-history",
   "pip": "https://pip.pypa.io/en/stable/news/",
   "wheel": "https://wheel.readthedocs.io/en/stable/news.html",
   "setuptools": "https://setuptools.readthedocs.io/en/latest/history.html",
-- 
cgit v1.2.3-54-g00ecf