Fix conflicting requirements

2020-07-27 15:40:43 +02:00 · 2020-07-27 15:40:43 +02:00 · c3341487e7
parent 79914e5385
commit c3341487e7
4 changed files with 8 additions and 2 deletions
--- a/misc/requirements/requirements-dev.txt
+++ b/misc/requirements/requirements-dev.txt
@ -23,4 +23,4 @@ sip==5.3.0
 six==1.15.0
 toml==0.10.1
 uritemplate==3.0.1
-urllib3==1.25.10
+# urllib3==1.25.10
--- a/misc/requirements/requirements-dev.txt-raw
+++ b/misc/requirements/requirements-dev.txt-raw
@ -5,3 +5,6 @@ github3.py
 bump2version
 requests
 pyqt-builder
+
+# Already included via test requirements
+#@ ignore: urllib3
--- a/misc/requirements/requirements-pylint.txt
+++ b/misc/requirements/requirements-pylint.txt
@ -19,5 +19,5 @@ requests==2.24.0
 six==1.15.0
 typed-ast==1.4.1 ; python_version<"3.8"
 uritemplate==3.0.1
-urllib3==1.25.10
+# urllib3==1.25.10
 wrapt==1.11.2
--- a/misc/requirements/requirements-pylint.txt-raw
+++ b/misc/requirements/requirements-pylint.txt-raw
@ -8,3 +8,6 @@ github3.py
 #@ markers: typed-ast python_version<"3.8"
 #@ filter: pylint < 2.5
 #@ filter: astroid < 2.4
+
+# Already included via test requirements
+#@ ignore: urllib3