requirements: pin urllib3 version to prevent request problems (#440)

* requirements: pin urllib3 version to prevent request problems * lint: temporary workaround for pyxdg pyright issues Co-authored-by: Alex Lowe <[email protected]> Signed-off-by: Claudio Matsuoka <[email protected]>
canonical · May 9, 2023 · 0ba53db · 0ba53db
1 parent 438951f
commit 0ba53db
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/setup.py b/setup.py
@@ -47,6 +47,7 @@ def is_rtd() -> bool:
     "pyxdg",
     "requests",
     "requests-unixsocket",
+    "urllib3<2",  # keep compatible API
 ]
 
 

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -72,10 +72,16 @@ def temp_xdg(tmpdir, mocker):
     mocker.patch("xdg.BaseDirectory.xdg_data_home", new=os.path.join(tmpdir, ".local"))
     mocker.patch("xdg.BaseDirectory.xdg_cache_home", new=os.path.join(tmpdir, ".cache"))
     mocker.patch(
-        "xdg.BaseDirectory.xdg_config_dirs", new=[xdg.BaseDirectory.xdg_config_home]
+        "xdg.BaseDirectory.xdg_config_dirs",
+        new=[
+            xdg.BaseDirectory.xdg_config_home  # pyright: ignore[reportGeneralTypeIssues]
+        ],
     )
     mocker.patch(
-        "xdg.BaseDirectory.xdg_data_dirs", new=[xdg.BaseDirectory.xdg_data_home]
+        "xdg.BaseDirectory.xdg_data_dirs",
+        new=[
+            xdg.BaseDirectory.xdg_data_home  # pyright: ignore[reportGeneralTypeIssues]
+        ],
     )
     mocker.patch.dict(os.environ, {"XDG_CONFIG_HOME": os.path.join(tmpdir, ".config")})