diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 1edeb2b090..f37976cb05 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -29,6 +29,9 @@ Changed Fixed ~~~~~~~~~ +* Pin chardet version as newest version was incompatible with pinned requests version #5101 + Contributed by @amanda11 + * Fixed issue were st2tests was not getting installed using pip because no version was specified. Contributed by @anirudhbagri diff --git a/fixed-requirements.txt b/fixed-requirements.txt index 0326841b1a..3804f1d34f 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -2,6 +2,8 @@ # Note: amqp is used by kombu amqp==2.5.2 apscheduler==3.6.3 +# requests 2.23 requires chardet < 3.1.0 +chardet<3.1.0 # NOTE: 2.0 version breaks pymongo work with hosts dnspython>=1.16.0,<2.0.0 cryptography==3.2 diff --git a/requirements.txt b/requirements.txt index d2a7cee282..21106c218a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,6 +10,7 @@ amqp==2.5.2 apscheduler==3.6.3 argcomplete bcrypt==3.1.7 +chardet<3.1.0 cryptography==3.2 dnspython<2.0.0,>=1.16.0 eventlet==0.25.1 diff --git a/st2actions/in-requirements.txt b/st2actions/in-requirements.txt index dcc00c6cf3..28db9ad84e 100644 --- a/st2actions/in-requirements.txt +++ b/st2actions/in-requirements.txt @@ -1,4 +1,4 @@ -# Remeber to list implicit packages here, otherwise version won't be fixated! +# Remember to list implicit packages here, otherwise version won't be fixated! apscheduler python-dateutil eventlet @@ -18,3 +18,5 @@ pyinotify git+https://github.com/StackStorm/logshipper.git@stackstorm_patched#egg=logshipper # required by pack_mgmt/setup_virtualenv.py#L135 virtualenv +# needed by requests +chardet diff --git a/st2actions/requirements.txt b/st2actions/requirements.txt index 80d3661f38..987fbddc9d 100755 --- a/st2actions/requirements.txt +++ b/st2actions/requirements.txt @@ -6,6 +6,7 @@ # in-requirements.txt for that component and then run 'make requirements' to # update the component requirements.txt apscheduler==3.6.3 +chardet<3.1.0 eventlet==0.25.1 git+https://github.com/StackStorm/logshipper.git@stackstorm_patched#egg=logshipper gitpython==2.1.15 diff --git a/st2api/in-requirements.txt b/st2api/in-requirements.txt index fcb639a58b..e1049a75c9 100644 --- a/st2api/in-requirements.txt +++ b/st2api/in-requirements.txt @@ -1,4 +1,4 @@ -# Remeber to list implicit packages here, otherwise version won't be fixated! +# Remember to list implicit packages here, otherwise version won't be fixated! eventlet jsonschema kombu diff --git a/st2auth/in-requirements.txt b/st2auth/in-requirements.txt index bfa07a2465..d6de70f4f8 100644 --- a/st2auth/in-requirements.txt +++ b/st2auth/in-requirements.txt @@ -1,4 +1,4 @@ -# Remeber to list implicit packages here, otherwise version won't be fixated! +# Remember to list implicit packages here, otherwise version won't be fixated! bcrypt eventlet oslo.config diff --git a/st2client/in-requirements.txt b/st2client/in-requirements.txt index ca4f1dabbb..973e6e5b67 100644 --- a/st2client/in-requirements.txt +++ b/st2client/in-requirements.txt @@ -1,4 +1,4 @@ -# Remeber to list implicit packages here, otherwise version won't be fixated! +# Remember to list implicit packages here, otherwise version won't be fixated! argcomplete prettytable pytz @@ -14,3 +14,5 @@ prompt-toolkit cryptography more-itertools==5.0.0 zipp>=0.5,<=1.0.0 +# needed by requests +chardet diff --git a/st2client/requirements.txt b/st2client/requirements.txt index 17c03201c8..3bbc655d71 100644 --- a/st2client/requirements.txt +++ b/st2client/requirements.txt @@ -6,6 +6,7 @@ # in-requirements.txt for that component and then run 'make requirements' to # update the component requirements.txt argcomplete +chardet<3.1.0 cryptography==3.2 jsonpath-rw==1.4.0 jsonschema==2.6.0 diff --git a/st2common/in-requirements.txt b/st2common/in-requirements.txt index 8e9b466e2d..6d94e21bcb 100644 --- a/st2common/in-requirements.txt +++ b/st2common/in-requirements.txt @@ -1,4 +1,4 @@ -# Remeber to list implicit packages here, otherwise version won't be fixated! +# Remember to list implicit packages here, otherwise version won't be fixated! apscheduler dnspython python-dateutil @@ -38,3 +38,5 @@ amqp # Used by st2-pack-* commands gitpython lockfile +# needed by requests +chardet diff --git a/st2common/requirements.txt b/st2common/requirements.txt index 2291be8677..fe9e8732fa 100644 --- a/st2common/requirements.txt +++ b/st2common/requirements.txt @@ -7,6 +7,7 @@ # update the component requirements.txt amqp==2.5.2 apscheduler==3.6.3 +chardet<3.1.0 cryptography==3.2 dnspython<2.0.0,>=1.16.0 eventlet==0.25.1 diff --git a/st2debug/in-requirements.txt b/st2debug/in-requirements.txt index 198c06caec..8e8127eb2d 100644 --- a/st2debug/in-requirements.txt +++ b/st2debug/in-requirements.txt @@ -1,6 +1,8 @@ -# Remeber to list implicit packages here, otherwise version won't be fixated! +# Remember to list implicit packages here, otherwise version won't be fixated! six eventlet pyyaml python-gnupg requests +# needed by requests +chardet diff --git a/st2debug/requirements.txt b/st2debug/requirements.txt index 0f1ea2340d..48bc439311 100644 --- a/st2debug/requirements.txt +++ b/st2debug/requirements.txt @@ -5,6 +5,7 @@ # If you want to update depdencies for a single component, modify the # in-requirements.txt for that component and then run 'make requirements' to # update the component requirements.txt +chardet<3.1.0 eventlet==0.25.1 python-gnupg==0.4.5 pyyaml==5.1.2 diff --git a/st2exporter/in-requirements.txt b/st2exporter/in-requirements.txt index b59b00dae1..62dbc998c7 100644 --- a/st2exporter/in-requirements.txt +++ b/st2exporter/in-requirements.txt @@ -1,4 +1,4 @@ -# Remeber to list implicit packages here, otherwise version won't be fixated! +# Remember to list implicit packages here, otherwise version won't be fixated! six eventlet kombu diff --git a/st2reactor/in-requirements.txt b/st2reactor/in-requirements.txt index ec1d87afd0..a6624b07e3 100644 --- a/st2reactor/in-requirements.txt +++ b/st2reactor/in-requirements.txt @@ -1,4 +1,4 @@ -# Remeber to list implicit packages here, otherwise version won't be fixated! +# Remember to list implicit packages here, otherwise version won't be fixated! apscheduler python-dateutil eventlet diff --git a/st2stream/in-requirements.txt b/st2stream/in-requirements.txt index 1b1bd859d4..76799216c1 100644 --- a/st2stream/in-requirements.txt +++ b/st2stream/in-requirements.txt @@ -1,4 +1,4 @@ -# Remeber to list implicit packages here, otherwise version won't be fixated! +# Remember to list implicit packages here, otherwise version won't be fixated! eventlet jsonschema kombu diff --git a/st2tests/in-requirements.txt b/st2tests/in-requirements.txt index 41b568f8a4..71af9feb58 100644 --- a/st2tests/in-requirements.txt +++ b/st2tests/in-requirements.txt @@ -1,4 +1,4 @@ -# Remeber to list implicit packages here, otherwise version won't be fixated! +# Remember to list implicit packages here, otherwise version won't be fixated! mock unittest2 nose