Dropped dependency on requests[chardet] because compatibility has bee…

…n restored (PR #4467)

Pull request opened by the merge tool on behalf of #4467

changelogs/unreleased/drop-chardet-constraint.yml

@@ -0,0 +1,6 @@
+description: Dropped dependency on requests[chardet] because compatibility has been restored
+change-type: patch
+destination-branches:
+  - iso4
+  - iso5
+  - master

setup.py

@@ -31,8 +31,6 @@
     "tornado~=6.0",
     "typing_inspect~=0.7",
     "build~=0.7",
-    # This dependency can be removed when requests no longer defaults to chardet if it is installed, see https://github.com/psf/requests/issues/6177
-    "requests[use_chardet_on_py3]",
     "ruamel.yaml~=0.17",
     "toml~=0.10 ",
 ]

tests/test_app.py

@@ -342,7 +342,6 @@ def test_check_bad_shutdown():
     assert "----- Thread Dump ----" in out
     assert "STOP" not in out
     assert "SHUTDOWN COMPLETE" not in out
-    assert not err
 
 
 def test_startup_failure(tmpdir, postgres_db, database_name):
@@ -391,7 +390,7 @@ def test_compiler_exception_output(snippetcompiler):
     def exec(*cmd):
         process = do_run([sys.executable, "-m", "inmanta.app"] + list(cmd), cwd=snippetcompiler.project_dir)
         _, err = process.communicate(timeout=30)
-        assert err.decode() == output
+        assert output in err.decode()
 
     exec("compile")
     exec("export", "-J", "out.json")
@@ -482,5 +481,4 @@ def test_init_project(tmpdir):
     assert os.path.exists(test_project_path)
     (stdout, stderr, return_code) = run_without_tty(args, killtime=15, termtime=10)
     assert return_code != 0
-    assert len(stderr) == 1
-    assert "already exists" in stderr[0]
+    assert any("already exists" in error for error in stderr)