Drop support to python 3.7

Author: jairhenrique

.github/workflows/main.yml

@@ -14,15 +14,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "pypy-3.8"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "pypy-3.8"]
 
     steps:
       - name: Install libgnutls28-dev
         run: |
           sudo apt update -q
           sudo apt install -q -y libgnutls28-dev libcurl4-gnutls-dev
 
-      - uses: actions/checkout@v3.5.2
+      - uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4

docs/installation.rst

@@ -9,7 +9,7 @@ with pip::
 Compatibility
 -------------
 
-VCR.py supports Python 3.7+, and `pypy <http://pypy.org>`__.
+VCR.py supports Python 3.8+, and `pypy <http://pypy.org>`__.
 
 The following HTTP libraries are supported:
 

setup.py

@@ -45,7 +45,6 @@ def run_tests(self):
 install_requires = [
     "PyYAML",
     "wrapt",
-    "six>=1.5",
     "yarl",
 ]
 
@@ -59,7 +58,7 @@ def run_tests(self):
     author_email="me@kevinmccarthy.org",
     url="https://github.com/kevin1024/vcrpy",
     packages=find_packages(exclude=["tests*"]),
-    python_requires=">=3.7",
+    python_requires=">=3.8",
     install_requires=install_requires,
     license="MIT",
     tests_require=["pytest", "mock", "pytest-httpbin"],
@@ -69,7 +68,6 @@ def run_tests(self):
         "Intended Audience :: Developers",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",

tests/unit/test_vcr.py

@@ -335,7 +335,7 @@ def function_with_return():
     assert ret == function_with_return()
 
 
-class TestVCRClass(VCR().test_case()):
+class TestVCRClass(VCR()):
     def no_decoration(self):
         assert httplib.HTTPConnection == _HTTPConnection
         self.test_dynamically_added()

tox.ini

@@ -3,15 +3,14 @@ skip_missing_interpreters=true
 envlist =
   cov-clean,
   lint,
-  {py37,py38,py39,py310,py311}-{requests,httplib2,urllib3,tornado4,boto3,aiohttp,httpx},
+  {py38,py39,py310,py311}-{requests,httplib2,urllib3,tornado4,boto3,aiohttp,httpx},
   {pypy3}-{requests,httplib2,urllib3,tornado4,boto3},
   {py310}-httpx019,
   cov-report
 
 
 [gh-actions]
 python =
-    3.7: py37
     3.8: py38
     3.9: py39
     3.10: py310, lint
@@ -67,7 +66,7 @@ commands =
     sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
 # We use Python 3.7. Tox sometimes tries to autodetect it based on the name of
 # the testenv, but "docs" does not give useful clues so we have to be explicit.
-basepython = python3.7
+basepython = python3.8
 
 [testenv]
 # Need to use develop install so that paths
@@ -89,20 +88,19 @@ deps =
     httplib2: httplib2
     urllib3: urllib3<2
     boto3: boto3
-    boto3: urllib3
+    boto3: urllib3<2
     aiohttp: aiohttp
     aiohttp: pytest-asyncio
     aiohttp: pytest-aiohttp
     httpx: httpx
-    {py37,py38,py39,py310}-{httpx}: httpx
-    {py37,py38,py39,py310}-{httpx}: pytest-asyncio
+    {py38,py39,py310}-{httpx}: httpx
+    {py38,py39,py310}-{httpx}: pytest-asyncio
     httpx: httpx>0.19
-    # httpx==0.19 is the latest version that supports allow_redirects, newer versions use follow_redirects
     httpx019: httpx==0.19
-    {py37,py38,py39,py310}-{httpx}: pytest-asyncio
+    {py38,py39,py310}-{httpx}: pytest-asyncio
 depends =
-  lint,{py37,py38,py39,py310,py311,pypy3}-{requests,httplib2,urllib3,tornado4,boto3},{py37,py38,py39,py310,py311}-{aiohttp},{py37,py38,py39,py310,py311}-{httpx}: cov-clean
-  cov-report: lint,{py37,py38,py39,py310,py311,pypy3}-{requests,httplib2,urllib3,tornado4,boto3},{py37,py38,py39,py310,py311}-{aiohttp}
+  lint,{py38,py39,py310,py311,pypy3}-{requests,httplib2,urllib3,tornado4,boto3},{py38,py39,py310,py311}-{aiohttp},{py38,py39,py310,py311}-{httpx}: cov-clean
+  cov-report: lint,{py38,py39,py310,py311,pypy3}-{requests,httplib2,urllib3,tornado4,boto3},{py38,py39,py310,py311}-{aiohttp}
 passenv =
     AWS_ACCESS_KEY_ID
     AWS_DEFAULT_REGION

vcr/config.py

@@ -6,8 +6,6 @@
 from collections import abc as collections_abc
 from pathlib import Path
 
-import six
-
 from . import filters, matchers
 from .cassette import Cassette
 from .persisters.filesystem import FilesystemPersister
@@ -253,5 +251,4 @@ def register_persister(self, persister):
 
     def test_case(self, predicate=None):
         predicate = predicate or self.is_test_method
-        # TODO: Remove this reference to `six` in favor of the Python3 equivalent
-        return six.with_metaclass(auto_decorate(self.use_cassette, predicate))
+        return auto_decorate(self.use_cassette, predicate)