From 2cb3252228babe60c2362ba9193c3e8896ee12f2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 11:21:17 -0500 Subject: [PATCH 1/7] Bump pytest from 7.4.2 to 7.4.3 (#2917) Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.4.2 to 7.4.3. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/7.4.2...7.4.3) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e3217ab0..78012432 100644 --- a/requirements.txt +++ b/requirements.txt @@ -24,7 +24,7 @@ coverage[toml]==7.3.0 cryptography==41.0.4 mypy==1.5.1 types-certifi==2021.10.8.2 -pytest==7.4.2 +pytest==7.4.3 ruff==0.0.291 trio==0.22.2 trio-typing==0.8.0 From aea487059b0bec471280e4d524d7a2fe894e8522 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 20:27:23 +0400 Subject: [PATCH 2/7] Bump mkdocs-material from 9.4.2 to 9.4.7 (#2915) Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.4.2 to 9.4.7. - [Release notes](https://github.com/squidfunk/mkdocs-material/releases) - [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG) - [Commits](https://github.com/squidfunk/mkdocs-material/compare/9.4.2...9.4.7) --- updated-dependencies: - dependency-name: mkdocs-material dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 78012432..e9303e5c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ types-chardet==5.0.4.5 # Documentation mkdocs==1.5.3 mkautodoc==0.2.0 -mkdocs-material==9.4.2 +mkdocs-material==9.4.7 # Packaging build==0.10.0 From 05937f4130f1cf06f697a56672e75f0521e2c576 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 15:57:15 -0500 Subject: [PATCH 3/7] Bump trio-typing from 0.8.0 to 0.9.0 (#2914) Bumps [trio-typing](https://github.com/python-trio/trio-typing) from 0.8.0 to 0.9.0. - [Commits](https://github.com/python-trio/trio-typing/compare/v0.8.0...v0.9.0) --- updated-dependencies: - dependency-name: trio-typing dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e9303e5c..a4241efd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -27,6 +27,6 @@ types-certifi==2021.10.8.2 pytest==7.4.3 ruff==0.0.291 trio==0.22.2 -trio-typing==0.8.0 +trio-typing==0.9.0 trustme==1.1.0 uvicorn==0.22.0 From 1b7f39eb44304f76b5f402914a2d2fbf57dc24c6 Mon Sep 17 00:00:00 2001 From: Kar Petrosyan <92274156+karpetrosyan@users.noreply.github.com> Date: Thu, 2 Nov 2023 15:48:53 +0400 Subject: [PATCH 4/7] Use ruff format (#2901) --- httpx/_transports/default.py | 2 +- pyproject.toml | 5 ++++- requirements.txt | 3 +-- scripts/check | 2 +- scripts/lint | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/httpx/_transports/default.py b/httpx/_transports/default.py index 7dba5b82..76c543ce 100644 --- a/httpx/_transports/default.py +++ b/httpx/_transports/default.py @@ -64,7 +64,7 @@ SOCKET_OPTION = typing.Union[ def map_httpcore_exceptions() -> typing.Iterator[None]: try: yield - except Exception as exc: # noqa: PIE-786 + except Exception as exc: mapped_exc = None for from_exc, to_exc in HTTPCORE_EXC_MAP.items(): diff --git a/pyproject.toml b/pyproject.toml index baa92e9a..0626f55f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -95,7 +95,10 @@ replacement = 'src="https://raw.githubusercontent.com/encode/httpx/master/\1"' [tool.ruff] select = ["E", "F", "I", "B", "PIE"] ignore = ["B904", "B028"] -line-length = 120 +line-length = 88 + +[tool.ruff.pycodestyle] +max-line-length = 120 [tool.ruff.isort] combine-as-imports = true diff --git a/requirements.txt b/requirements.txt index a4241efd..a08636d4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,13 +19,12 @@ build==0.10.0 twine==4.0.2 # Tests & Linting -black==23.9.1 coverage[toml]==7.3.0 cryptography==41.0.4 mypy==1.5.1 types-certifi==2021.10.8.2 pytest==7.4.3 -ruff==0.0.291 +ruff==0.1.3 trio==0.22.2 trio-typing==0.9.0 trustme==1.1.0 diff --git a/scripts/check b/scripts/check index ef7b064f..a4bce094 100755 --- a/scripts/check +++ b/scripts/check @@ -9,6 +9,6 @@ export SOURCE_FILES="httpx tests" set -x ./scripts/sync-version -${PREFIX}black --check --diff $SOURCE_FILES +${PREFIX}ruff format $SOURCE_FILES --diff ${PREFIX}mypy $SOURCE_FILES ${PREFIX}ruff check $SOURCE_FILES diff --git a/scripts/lint b/scripts/lint index 22d12cba..3d8685a0 100755 --- a/scripts/lint +++ b/scripts/lint @@ -9,4 +9,4 @@ export SOURCE_FILES="httpx tests" set -x ${PREFIX}ruff --fix $SOURCE_FILES -${PREFIX}black $SOURCE_FILES +${PREFIX}ruff format $SOURCE_FILES From 280a89a4d13b65852b065b3e1aaa53d388946a88 Mon Sep 17 00:00:00 2001 From: Paul Schreiber Date: Thu, 2 Nov 2023 10:41:25 -0400 Subject: [PATCH 5/7] Support newer versions of httpcore (#2885) * Support newer versions of httpcore httpcore 1.0.0 was release October 6, 2023. * Update pyproject.toml * Update pyproject.toml Co-authored-by: Kar Petrosyan <92274156+karpetrosyan@users.noreply.github.com> * Update pyproject.toml Co-authored-by: Tom Christie * Update CHANGELOG.md --------- Co-authored-by: Tom Christie Co-authored-by: Kar Petrosyan <92274156+karpetrosyan@users.noreply.github.com> --- CHANGELOG.md | 1 + pyproject.toml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73b99c6b..25041f21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Added * Add support for Python 3.12. (#2854) +* Add support for httpcore 1.0 (#2885) ### Fixed diff --git a/pyproject.toml b/pyproject.toml index 0626f55f..75c5e7d9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,8 @@ classifiers = [ ] dependencies = [ "certifi", - "httpcore>=0.18.0,<0.19.0", + "httpcore", + "anyio", "idna", "sniffio", ] From b07d4e8ce40f730b5074abe36347b933f1b77814 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 3 Nov 2023 13:18:54 +0000 Subject: [PATCH 6/7] Version 0.25.1 (#2923) --- CHANGELOG.md | 10 +++++----- httpx/__version__.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25041f21..f0c89a1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## Unreleased -### Added +### 0.25.1 (3rd November, 2023) * Add support for Python 3.12. (#2854) * Add support for httpcore 1.0 (#2885) @@ -15,7 +15,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 @@ -63,13 +63,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 @@ -81,7 +81,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. diff --git a/httpx/__version__.py b/httpx/__version__.py index bfa421ad..9f92ef99 100644 --- a/httpx/__version__.py +++ b/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" From c19728ca39f30f90d13e7eae954169550b2e8b66 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 08:55:10 -0500 Subject: [PATCH 7/7] Bump build from 0.10.0 to 1.0.3 (#2913) Bumps [build](https://github.com/pypa/build) from 0.10.0 to 1.0.3. - [Release notes](https://github.com/pypa/build/releases) - [Changelog](https://github.com/pypa/build/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pypa/build/compare/0.10.0...1.0.3) --- updated-dependencies: - dependency-name: build dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom Christie --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a08636d4..e859bfc6 100644 --- a/requirements.txt +++ b/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