Merge branch 'master' into py

encode · Mar 16, 2022 · d3503e1 · d3503e1
2 parents 75516a2 + c82885a
commit d3503e1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/docs/third_party_packages.md b/docs/third_party_packages.md
@@ -54,6 +54,12 @@ A utility for record and repeat an http request.
 
 This package adds caching functionality to HTTPX
 
+### robox
+
+[Github](https://github.com/danclaudiupop/robox)
+
+A library for scraping the web built on top of HTTPX.
+
 ## Gists
 
 <!-- NOTE: this list is in alphabetical order. -->

diff --git a/httpx/_main.py b/httpx/_main.py
@@ -69,7 +69,7 @@ def print_help() -> None:
     )
 
     table.add_row(
-        "--proxy [cyan]URL",
+        "--proxies [cyan]URL",
         "Send the request via a proxy. Should be the URL giving the proxy address.",
     )
 

diff --git a/requirements.txt b/requirements.txt
@@ -21,12 +21,12 @@ black==21.11b1
 coverage==6.0.2
 cryptography==36.0.1
 flake8==3.9.2
-flake8-bugbear==21.9.2
+flake8-bugbear==22.1.11
 flake8-pie==0.15.0; python_version>='3.7'
 isort==5.10.1
 mypy==0.910
 types-certifi==2021.10.8.0
-pytest==6.2.5
+pytest==7.0.1
 pytest-asyncio==0.16.0
 pytest-trio==0.7.0
 trio==0.19.0