Skip to content

Commit

Permalink
Dropped dependency on requests[chardet] because compatibility has bee…
Browse files Browse the repository at this point in the history
…n restored (PR #4467)

# Description

With the context given in psf/requests#6177 (comment), I think it should be safe to drop this requirement again. Do you agree?

# Self Check:

Strike through any lines that are not applicable (`~~line~~`) then check the box

- [ ] Attached issue to pull request
- [ ] Changelog entry
- [ ] Type annotations are present
- [ ] Code is clear and sufficiently documented
- [ ] No (preventable) type errors (check using make mypy or make mypy-diff)
- [ ] Sufficient test cases (reproduces the bug/tests the requested feature)
- [ ] Correct, in line with design
- [ ] End user documentation is included or an issue is created for end-user documentation (add ref to issue here: )

# Reviewer Checklist:

- [ ] Sufficient test cases (reproduces the bug/tests the requested feature)
- [ ] Code is clear and sufficiently documented
- [ ] Correct, in line with design
  • Loading branch information
Hugo-Inmanta authored and inmantaci committed Jun 28, 2022
1 parent 20123e3 commit e34829f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
6 changes: 6 additions & 0 deletions 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
2 changes: 0 additions & 2 deletions setup.py
Expand Up @@ -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 ",
]
Expand Down
6 changes: 2 additions & 4 deletions tests/test_app.py
Expand Up @@ -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):
Expand Down Expand Up @@ -398,7 +397,7 @@ def test_compiler_exception_output(snippetcompiler, cache_cf_files):
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()

no_cache_option = [] if cache_cf_files else ["--no-cache"]

Expand Down Expand Up @@ -494,5 +493,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)

0 comments on commit e34829f

Please sign in to comment.