Apply PR feedback

docs/changelog.rst

@@ -7,14 +7,6 @@ For a full list of triaged issues, bugs and PRs and what release they are target
 
 All help in providing PRs to close out bug issues is appreciated. Even if that is providing a repo that fully replicates issues. We have very generous contributors that have added these to bug issues which meant another contributor picked up the bug and closed it out.
 
--  8.1.0
-    - Enable brotli decompression if available (via ``brotli``, ``brotlipy`` or ``brotlicffi``) (#620) - thanks @immerrr
-    - Fix aiohttp allowing both ``data`` and ``json`` arguments when one is None (#624) - thanks @leorochael
-    - Fix usage of io-like interface with VCR.py (#906) - thanks @tito and @kevdevg
-    - Migrate to declarative Python package config (#767) - thanks @deronnax
-    - Various linting fixes - thanks @jairhenrique
-    - CI: bump actions/checkout from 5 to 6 (#955)
-
 -  8.0.0
     - BREAKING: Drop support for Python 3.9 (major version bump) - thanks @jairhenrique
     - BREAKING: Drop support for urllib3 < 2 - fixes CVE warnings from urllib3 1.x (#926, #880) - thanks @jairhenrique

pyproject.toml

@@ -1,72 +1,3 @@
-[project]
-name = "vcrpy"
-authors = [{name = "Kevin McCarthy", email = "me@kevinmccarthy.org"}]
-license = {text = "MIT"}
-description = "Automatically mock your HTTP interactions to simplify and speed up testing"
-classifiers = [
-    "Development Status :: 5 - Production/Stable",
-    "Environment :: Console",
-    "Intended Audience :: Developers",
-    "Programming Language :: Python",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-    "Programming Language :: Python :: 3.13",
-    "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: Implementation :: CPython",
-    "Programming Language :: Python :: Implementation :: PyPy",
-    "Topic :: Software Development :: Testing",
-    "Topic :: Internet :: WWW/HTTP",
-    "License :: OSI Approved :: MIT License",
-]
-urls = {Homepage = "https://github.com/kevin1024/vcrpy"}
-requires-python = ">=3.10"
-dependencies = [
-    "PyYAML",
-    "wrapt",
-]
-dynamic = ["version"]
-
-[project.readme]
-file = "README.rst"
-content-type = "text/x-rst"
-
-[project.optional-dependencies]
-tests = [
-    "aiohttp",
-    "boto3",
-    "cryptography",
-    "httpbin",
-    "httpcore",
-    "httplib2",
-    "httpx",
-    "pycurl; platform_python_implementation !='PyPy'",
-    "pytest",
-    "pytest-aiohttp",
-    "pytest-asyncio",
-    "pytest-cov",
-    "pytest-httpbin",
-    "requests>=2.22.0",
-    "tornado",
-    "urllib3",
-    "werkzeug==2.0.3",
-]
-
-[tool.setuptools]
-include-package-data = false
-
-[tool.setuptools.packages.find]
-exclude = ["tests*"]
-namespaces = false
-
-[tool.setuptools.dynamic]
-version = {attr = "vcr.__version__"}
-
-[build-system]
-requires = ["setuptools>=61.2"]
-build-backend = "setuptools.build_meta"
-
 [tool.codespell]
 skip = '.git,*.pdf,*.svg,.tox'
 ignore-regex = "\\\\[fnrstv]"

setup.cfg

@@ -1,58 +1,2 @@
-[metadata]
+[bdist_wheel]
-name = vcrpy
+universal=1
-version = attr: vcr.__version__
-author = Kevin McCarthy
-author_email = me@kevinmccarthy.org
-license = MIT
-description = Automatically mock your HTTP interactions to simplify and speed up testing
-url = https://github.com/kevin1024/vcrpy
-long_description = file: README.rst
-long_description_content_type = text/x-rst
-classifiers =
-    Development Status :: 5 - Production/Stable
-    Environment :: Console
-    Intended Audience :: Developers
-    Programming Language :: Python
-    Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.10
-    Programming Language :: Python :: 3.11
-    Programming Language :: Python :: 3.12
-    Programming Language :: Python :: 3.13
-    Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: Implementation :: CPython
-    Programming Language :: Python :: Implementation :: PyPy
-    Topic :: Software Development :: Testing
-    Topic :: Internet :: WWW/HTTP
-    License :: OSI Approved :: MIT License
-
-[options]
-packages = find:
-python_requires = >=3.10
-install_requires =
-    PyYAML
-    wrapt
-tests_require =
-    vcrpy[tests]
-
-[options.packages.find]
-exclude = tests*
-
-[options.extras_require]
-tests =
-    aiohttp
-    boto3
-    cryptography
-    httpbin
-    httpcore
-    httplib2
-    httpx
-    pycurl; platform_python_implementation !='PyPy'
-    pytest
-    pytest-aiohttp
-    pytest-asyncio
-    pytest-cov
-    pytest-httpbin
-    requests>=2.22.0
-    tornado
-    urllib3
-    werkzeug==2.0.3

setup.py

@@ -0,0 +1,89 @@
+#!/usr/bin/env python
+
+import codecs
+import os
+import re
+from pathlib import Path
+
+from setuptools import find_packages, setup
+
+long_description = Path("README.rst").read_text()
+here = os.path.abspath(os.path.dirname(__file__))
+
+
+def read(*parts):
+    # intentionally *not* adding an encoding option to open, See:
+    #   https://github.com/pypa/virtualenv/issues/201#issuecomment-3145690
+    with codecs.open(os.path.join(here, *parts), "r") as fp:
+        return fp.read()
+
+
+def find_version(*file_paths):
+    version_file = read(*file_paths)
+    version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]", version_file, re.M)
+    if version_match:
+        return version_match.group(1)
+
+    raise RuntimeError("Unable to find version string.")
+
+
+install_requires = [
+    "PyYAML",
+    "wrapt",
+]
+
+extras_require = {
+    "tests": [
+        "aiohttp",
+        "boto3",
+        "cryptography",
+        "httpbin",
+        "httpcore",
+        "httplib2",
+        "httpx",
+        "pycurl; platform_python_implementation !='PyPy'",
+        "pytest",
+        "pytest-aiohttp",
+        "pytest-asyncio",
+        "pytest-cov",
+        "pytest-httpbin",
+        "requests>=2.22.0",
+        "tornado",
+        "urllib3",
+        "werkzeug==2.0.3",
+    ],
+}
+
+setup(
+    name="vcrpy",
+    version=find_version("vcr", "__init__.py"),
+    description=("Automatically mock your HTTP interactions to simplify and speed up testing"),
+    long_description=long_description,
+    long_description_content_type="text/x-rst",
+    author="Kevin McCarthy",
+    author_email="me@kevinmccarthy.org",
+    url="https://github.com/kevin1024/vcrpy",
+    packages=find_packages(exclude=["tests*"]),
+    python_requires=">=3.10",
+    install_requires=install_requires,
+    license="MIT",
+    extras_require=extras_require,
+    tests_require=extras_require["tests"],
+    classifiers=[
+        "Development Status :: 5 - Production/Stable",
+        "Environment :: Console",
+        "Intended Audience :: Developers",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
+        "Programming Language :: Python :: 3 :: Only",
+        "Programming Language :: Python :: Implementation :: CPython",
+        "Programming Language :: Python :: Implementation :: PyPy",
+        "Topic :: Software Development :: Testing",
+        "Topic :: Internet :: WWW/HTTP",
+        "License :: OSI Approved :: MIT License",
+    ],
+)

tests/integration/test_aiohttp.py

@@ -137,29 +137,19 @@ def test_stream(tmpdir, httpbin):
         assert cassette.play_count == 1
 
 
-POST_DATA = {"key1": "value1", "key2": "value2"}
-
-
 @pytest.mark.online
-@pytest.mark.parametrize(
+@pytest.mark.parametrize("body", ["data", "json"])
-    "kwargs",
+def test_post(tmpdir, body, caplog, httpbin):
-    [
-        {"data": POST_DATA},
-        {"json": POST_DATA},
-        {"data": POST_DATA, "json": None},
-        {"data": None, "json": POST_DATA},
-    ],
-)
-def test_post(tmpdir, kwargs, caplog, httpbin):
     caplog.set_level(logging.INFO)
-    url = httpbin.url + "/post"
+    data = {"key1": "value1", "key2": "value2"}
+    url = httpbin.url
     with vcr.use_cassette(str(tmpdir.join("post.yaml"))):
-        _, response_json = post(url, **kwargs)
+        _, response_json = post(url, **{body: data})
 
     with vcr.use_cassette(str(tmpdir.join("post.yaml"))) as cassette:
         request = cassette.requests[0]
-        assert request.body == POST_DATA
+        assert request.body == data
-        _, cassette_response_json = post(url, **kwargs)
+        _, cassette_response_json = post(url, **{body: data})
         assert cassette_response_json == response_json
         assert cassette.play_count == 1
 
@@ -173,17 +163,6 @@ def test_post(tmpdir, kwargs, caplog, httpbin):
     ), "Log message not found."
 
 
-@pytest.mark.online
-def test_post_data_plus_json_error(tmpdir, httpbin):
-    url = httpbin.url + "/post"
-    with (
-        vcr.use_cassette(str(tmpdir.join("post.yaml"))) as cassette,
-        pytest.raises(ValueError, match="data and json parameters can not be used at the same time"),
-    ):
-        post(url, data=POST_DATA, json=POST_DATA)
-    assert cassette.requests == []
-
-
 @pytest.mark.online
 def test_params(tmpdir, httpbin):
     url = httpbin.url + "/get?d=d"

vcr/__init__.py

@@ -4,7 +4,7 @@ from logging import NullHandler
 from .config import VCR
 from .record_mode import RecordMode as mode  # noqa: F401
 
-__version__ = "8.1.0"
+__version__ = "8.0.0"
 
 logging.getLogger(__name__).addHandler(NullHandler())
 

vcr/stubs/aiohttp_stubs.py

@@ -245,11 +245,7 @@ def vcr_request(cassette, real_request):
         headers = kwargs.get("headers")
         auth = kwargs.get("auth")
         headers = self._prepare_headers(headers)
-        data = kwargs.get("data")
+        data = kwargs.get("data", kwargs.get("json"))
-        if data is None:
-            data = kwargs.get("json")
-        elif kwargs.get("json") is not None:
-            raise ValueError("data and json parameters can not be used at the same time")
         params = kwargs.get("params")
         cookies = kwargs.get("cookies")