diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6fcb561b..a455588e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -9,6 +9,7 @@ This project adheres to `Semantic Versioning `_. `2.3.0-dev`_ (unreleased) ------------------------- * Added support for combining cookies specified on the CLI and in a session file (`#932`_). +* Added out of the box SOCKS support with no extra installation (`#904`_). `2.2.0`_ (2020-06-18) @@ -456,6 +457,7 @@ This project adheres to `Semantic Versioning `_. .. _#870: https://github.com/jakubroztocil/httpie/issues/870 .. _#895: https://github.com/jakubroztocil/httpie/issues/895 .. _#920: https://github.com/jakubroztocil/httpie/issues/920 +.. _#904: https://github.com/jakubroztocil/httpie/issues/904 .. _#925: https://github.com/jakubroztocil/httpie/issues/925 .. _#932: https://github.com/jakubroztocil/httpie/issues/932 .. _#934: https://github.com/jakubroztocil/httpie/issues/934 diff --git a/README.rst b/README.rst index 0f2ac3e8..2c5e2ec7 100644 --- a/README.rst +++ b/README.rst @@ -1055,15 +1055,6 @@ In your ``~/.bash_profile``: SOCKS ----- -Homebrew-installed HTTPie comes with SOCKS proxy support out of the box. -To enable SOCKS proxy support for non-Homebrew installations, you’ll -might need to install ``requests[socks]`` manually using ``pip``: - - -.. code-block:: bash - - $ pip install -U requests[socks] - Usage is the same as for other types of `proxies`_: .. code-block:: bash diff --git a/setup.py b/setup.py index 084ea47c..1911cc66 100644 --- a/setup.py +++ b/setup.py @@ -37,6 +37,7 @@ tests_require = [ install_requires = [ 'requests>=2.22.0', + 'requests[socks]>=2.22.0', 'Pygments>=2.5.2', ] install_requires_win_only = [