Merge branch 'master' into drop-proxies

Author: karpetrosyan

CHANGELOG.md

@@ -10,6 +10,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 * The `proxies` argument is now deprecated and supposed to be replaced by the `proxy` argument. (#2879)
 
+## 0.25.1 (3rd November, 2023)
+
 ### Added
 
 * Add support for Python 3.12. (#2854)
@@ -19,7 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 * Raise `ValueError` on `Response.encoding` being set after `Response.text` has been accessed. (#2852)
 
-## 0.25.0 (11th Sep, 2023)
+## 0.25.0 (11th September, 2023)
 
 ### Removed
 
@@ -67,13 +69,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 * The `rfc3986` dependancy has been removed. (#2252)
 
-## 0.23.3 (4th Jan, 2023)
+## 0.23.3 (4th January, 2023)
 
 ### Fixed
 
 * Version 0.23.2 accidentally included stricter type checking on query parameters. This shouldn've have been included in a minor version bump, and is now reverted. (#2523, #2539)
 
-## 0.23.2 (2nd Jan, 2023)
+## 0.23.2 (2nd January, 2023)
 
 ### Added
 
@@ -85,7 +87,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * Raise `TypeError` if content is passed a dict-instance. (#2495)
 * Partially revert the API breaking change in 0.23.1, which removed `RawURL`. We continue to expose a `url.raw` property which is now a plain named-tuple. This API is still expected to be deprecated, but we will do so with a major version bump. (#2481)
 
-## 0.23.1 (18th Nov, 2022)
+## 0.23.1 (18th November, 2022)
 
 **Note**: The 0.23.1 release should have used a proper version bump, rather than a minor point release.
 There are API surface area changes that may affect some users.

httpx/__version__.py

@@ -1,3 +1,3 @@
 __title__ = "httpx"
 __description__ = "A next generation HTTP client, for Python 3."
-__version__ = "0.25.0"
+__version__ = "0.25.1"

pyproject.toml

@@ -29,7 +29,7 @@ classifiers = [
 ]
 dependencies = [
     "certifi",
-    "httpcore",
+    "httpcore==1.*",
     "anyio",
     "idna",
     "sniffio",
@@ -70,6 +70,7 @@ include = [
     "/httpx",
     "/CHANGELOG.md",
     "/README.md",
+    "/tests",
 ]
 
 [tool.hatch.metadata.hooks.fancy-pypi-readme]

requirements.txt

@@ -15,7 +15,7 @@ mkautodoc==0.2.0
 mkdocs-material==9.4.7
 
 # Packaging
-build==0.10.0
+build==1.0.3
 twine==4.0.2
 
 # Tests & Linting

tests/test_decoders.py

@@ -1,7 +1,6 @@
 import typing
 import zlib
 
-import brotli
 import chardet
 import pytest
 
@@ -61,7 +60,7 @@ def test_gzip():
 
 def test_brotli():
     body = b"test 123"
-    compressed_body = brotli.compress(body)
+    compressed_body = b"\x8b\x03\x80test 123\x03"
 
     headers = [(b"Content-Encoding", b"br")]
     response = httpx.Response(
@@ -94,7 +93,7 @@ def test_multi():
 
 def test_multi_with_identity():
     body = b"test 123"
-    compressed_body = brotli.compress(body)
+    compressed_body = b"\x8b\x03\x80test 123\x03"
 
     headers = [(b"Content-Encoding", b"br, identity")]
     response = httpx.Response(
@@ -153,8 +152,7 @@ def test_decoders_empty_cases(header_value):
 @pytest.mark.parametrize("header_value", (b"deflate", b"gzip", b"br"))
 def test_decoding_errors(header_value):
     headers = [(b"Content-Encoding", header_value)]
-    body = b"test 123"
-    compressed_body = brotli.compress(body)[3:]
+    compressed_body = b"invalid"
     with pytest.raises(httpx.DecodingError):
         request = httpx.Request("GET", "https://example.org")
         httpx.Response(200, headers=headers, content=compressed_body, request=request)