From 3f72b25c61316e1222eb401a9ea916b72842bc3a Mon Sep 17 00:00:00 2001 From: Yossi Rozantsev <54272821+Apakottur@users.noreply.github.com> Date: Mon, 29 Jan 2024 09:37:08 +0000 Subject: [PATCH 1/8] Support Pytest 8.0.0 Support the newest Pytest version - https://github.com/pytest-dev/pytest/releases/tag/8.0.0 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 18f0295..0959a8f 100644 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ packages=find_packages(exclude=["tests*"]), package_data={"pytest_httpx": ["py.typed"]}, entry_points={"pytest11": ["pytest_httpx = pytest_httpx"]}, - install_requires=["httpx==0.26.*", "pytest==7.*"], + install_requires=["httpx==0.26.*", "pytest>=7.*"], extras_require={ "testing": [ # Used to run async test functions From a3a6def38c6f8eed9a6cda4d35ff2fa4d5cc2b93 Mon Sep 17 00:00:00 2001 From: Yossi Rozantsev <54272821+Apakottur@users.noreply.github.com> Date: Mon, 29 Jan 2024 12:54:31 +0000 Subject: [PATCH 2/8] Update setup.py Chane to `pytest>=7,<9` --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0959a8f..f5bd6fd 100644 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ packages=find_packages(exclude=["tests*"]), package_data={"pytest_httpx": ["py.typed"]}, entry_points={"pytest11": ["pytest_httpx = pytest_httpx"]}, - install_requires=["httpx==0.26.*", "pytest>=7.*"], + install_requires=["httpx==0.26.*", "pytest>=7,<9"], extras_require={ "testing": [ # Used to run async test functions From 65a630b19a90a19388508700889c42f2eca84409 Mon Sep 17 00:00:00 2001 From: Colin-b Date: Mon, 29 Jan 2024 20:49:13 +0100 Subject: [PATCH 3/8] Test with both pytest versions --- .github/workflows/release.yml | 14 ++------------ .github/workflows/test.yml | 2 ++ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e3411a9..4bb9dcb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,23 +9,13 @@ jobs: build: runs-on: ubuntu-latest - strategy: - matrix: - python-version: ['3.9', '3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} + - name: Set up Python uses: actions/setup-python@v4 with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - python -m pip install --upgrade pip - python -m pip install -e .[testing] - - name: Test with pytest - run: | - pytest --cov=pytest_httpx --cov-fail-under=100 --cov-report=term-missing --runpytest=subprocess + python-version: 3.12 - name: Create packages run: | python -m pip install wheel setuptools diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bd49a71..2d8d553 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,6 +9,7 @@ jobs: strategy: matrix: python-version: ['3.9', '3.10', '3.11', '3.12'] + pytest-major-version: ['7', '8'] steps: - uses: actions/checkout@v4 @@ -19,6 +20,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip + python -m pip install pytest~=${{ matrix.pytest-major-version }}.0 python -m pip install -e .[testing] - name: Test run: | From 8ff09684017945f8281998fa7892785c4e3f4ece Mon Sep 17 00:00:00 2001 From: Colin-b Date: Mon, 29 Jan 2024 20:50:38 +0100 Subject: [PATCH 4/8] Document addition of pytest 8 support --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 612b795..ae46052 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Added +- Add support for [`pytest`](https://docs.pytest.org)==8.\* ([`pytest`](https://docs.pytest.org)==7.\* is still supported for now). (many thanks to [`Yossi Rozantsev`](https://github.com/Apakottur)) ## [0.28.0] - 2023-12-21 ### Changed From e8f3321bc5b7e210a063636fc090b0840a355394 Mon Sep 17 00:00:00 2001 From: Colin-b Date: Mon, 29 Jan 2024 20:51:16 +0100 Subject: [PATCH 5/8] Bump license year --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 3738ea5..cab2d30 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2023 Colin Bounouar +Copyright (c) 2024 Colin Bounouar Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 444ba232af770743b77df568190cea03dbe5a551 Mon Sep 17 00:00:00 2001 From: Colin-b Date: Mon, 29 Jan 2024 20:54:14 +0100 Subject: [PATCH 6/8] Force pytest version --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2d8d553..dfe5bfe 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,8 +20,8 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install pytest~=${{ matrix.pytest-major-version }}.0 python -m pip install -e .[testing] + python -m pip install pytest~=${{ matrix.pytest-major-version }}.0 - name: Test run: | pytest --cov=pytest_httpx --cov-fail-under=100 --cov-report=term-missing --runpytest=subprocess From aa505cb65a982732d4550e3a698c30302bfe2821 Mon Sep 17 00:00:00 2001 From: Colin-b Date: Mon, 29 Jan 2024 20:56:12 +0100 Subject: [PATCH 7/8] Use the latest actions --- .github/workflows/release.yml | 4 ++-- .github/workflows/test.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4bb9dcb..4b78e19 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,9 +13,9 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: - python-version: 3.12 + python-version: '3.12' - name: Create packages run: | python -m pip install wheel setuptools diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dfe5bfe..dc4ccc1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies From b91bae4ec02a35e692700356dfe3753a20e32fc8 Mon Sep 17 00:00:00 2001 From: Colin-b Date: Mon, 29 Jan 2024 21:02:47 +0100 Subject: [PATCH 8/8] Release version 0.29.0 today --- .pre-commit-config.yaml | 2 +- CHANGELOG.md | 5 ++++- pytest_httpx/version.py | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 53f937b..43c0278 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,5 @@ repos: - repo: https://github.com/psf/black - rev: 23.12.0 + rev: 24.1.1 hooks: - id: black \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index ae46052..22e9829 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] + +## [0.29.0] - 2024-01-29 ### Added - Add support for [`pytest`](https://docs.pytest.org)==8.\* ([`pytest`](https://docs.pytest.org)==7.\* is still supported for now). (many thanks to [`Yossi Rozantsev`](https://github.com/Apakottur)) @@ -303,7 +305,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - First release, should be considered as unstable for now as design might change. -[Unreleased]: https://github.com/Colin-b/pytest_httpx/compare/v0.28.0...HEAD +[Unreleased]: https://github.com/Colin-b/pytest_httpx/compare/v0.29.0...HEAD +[0.29.0]: https://github.com/Colin-b/pytest_httpx/compare/v0.28.0...v0.29.0 [0.28.0]: https://github.com/Colin-b/pytest_httpx/compare/v0.27.0...v0.28.0 [0.27.0]: https://github.com/Colin-b/pytest_httpx/compare/v0.26.0...v0.27.0 [0.26.0]: https://github.com/Colin-b/pytest_httpx/compare/v0.25.0...v0.26.0 diff --git a/pytest_httpx/version.py b/pytest_httpx/version.py index 2640171..dc6a83d 100644 --- a/pytest_httpx/version.py +++ b/pytest_httpx/version.py @@ -3,4 +3,4 @@ # Major should be incremented in case there is a breaking change. (eg: 2.5.8 -> 3.0.0) # Minor should be incremented in case there is an enhancement. (eg: 2.5.8 -> 2.6.0) # Patch should be incremented in case there is a bug fix. (eg: 2.5.8 -> 2.5.9) -__version__ = "0.28.0" +__version__ = "0.29.0"