This is an automated email from the ASF dual-hosted git repository. brondsem pushed a commit to branch db/8386 in repository https://gitbox.apache.org/repos/asf/allura.git
commit 4c28467461678957b51664f4d75b0fcc948fc5fc Author: Dave Brondsema <[email protected]> AuthorDate: Fri Apr 30 17:49:33 2021 -0400 [#8386] depend on cchardet (MPL) instead of chardet (GPL). "requests" still needs chardet, our Allura code and other deps are ok with having only cchardet --- Allura/allura/lib/helpers.py | 5 +---- requirements-optional.txt | 3 --- requirements.in | 2 +- requirements.txt | 6 +++--- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Allura/allura/lib/helpers.py b/Allura/allura/lib/helpers.py index 8a526b6..e63232a 100644 --- a/Allura/allura/lib/helpers.py +++ b/Allura/allura/lib/helpers.py @@ -48,10 +48,7 @@ import tg import six from six.moves import range from six.moves import map -try: - import cchardet as chardet -except ImportError: - import chardet +import cchardet as chardet import pkg_resources from formencode.validators import FancyValidator from dateutil.parser import parse diff --git a/requirements-optional.txt b/requirements-optional.txt index 037b5d4..9248ca2 100644 --- a/requirements-optional.txt +++ b/requirements-optional.txt @@ -9,6 +9,3 @@ mediawiki2html # GPL # for spam checking akismet==1.0.1 - -# faster charset detection -cchardet==2.1.1 # GPL \ No newline at end of file diff --git a/requirements.in b/requirements.in index 5fc8392..184dea3 100644 --- a/requirements.in +++ b/requirements.in @@ -1,7 +1,7 @@ ActivityStream==0.3.0 beautifulsoup4 Beaker -chardet +cchardet colander==1.7.0 cryptography decorator diff --git a/requirements.txt b/requirements.txt index 0edabe3..453c318 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,14 +18,14 @@ beautifulsoup4==4.8.0 # webtest bleach==3.3.0 # via pypeline +cchardet==2.1.7 + # via -r requirements.in certifi==2019.6.16 # via requests cffi==1.12.2 # via cryptography chardet==3.0.4 - # via - # -r requirements.in - # requests + # via requests colander==1.7.0 # via -r requirements.in crank==0.8.1
