diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cc29869..414e944 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,14 +13,14 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "pypy3"] + python-version: ["3.7", "3.8", "3.9", "3.10", "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.0.0 - name: Set up Python ${{ matrix.python-version }} diff --git a/docs/contributing.rst b/docs/contributing.rst index 82cbeeb..d41a23b 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -96,11 +96,11 @@ The test suite is pretty big and slow, but you can tell tox to only run specific tox -e {pyNN}-{HTTP_LIBRARY} -- - tox -e py36-requests -- -v -k "'test_status_code or test_gzip'" + tox -e py37-requests -- -v -k "'test_status_code or test_gzip'" tox -e py37-requests -- -v --last-failed This will run only tests that look like ``test_status_code`` or -``test_gzip`` in the test suite, and only in the python 3.6 environment +``test_gzip`` in the test suite, and only in the python 3.7 environment that has ``requests`` installed. Also, in order for the boto tests to run, you will need an AWS key. @@ -130,10 +130,10 @@ in this example:: pip install tox tox-pyenv # Install supported versions (at time of writing), this does not activate them - pyenv install 3.6.9 3.7.5 3.8.0 pypy3.6-7.2.0 + pyenv install 3.7.5 3.8.0 pypy3.8 # This activates them - pyenv local 3.6.9 3.7.5 3.8.0 pypy3.6-7.2.0 + pyenv local 3.7.5 3.8.0 pypy3.8 # Run the whole test suite tox diff --git a/docs/installation.rst b/docs/installation.rst index f47efc9..a6a0789 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -9,7 +9,7 @@ with pip:: Compatibility ------------- -VCR.py supports Python 3.6+, and `pypy `__. +VCR.py supports Python 3.7+, and `pypy `__. The following HTTP libraries are supported: diff --git a/setup.py b/setup.py index 8a031ce..348c635 100644 --- a/setup.py +++ b/setup.py @@ -59,7 +59,7 @@ setup( author_email="me@kevinmccarthy.org", url="https://github.com/kevin1024/vcrpy", packages=find_packages(exclude=["tests*"]), - python_requires=">=3.6", + python_requires=">=3.7", install_requires=install_requires, license="MIT", tests_require=["pytest", "mock", "pytest-httpbin"], @@ -69,7 +69,6 @@ setup( "Intended Audience :: Developers", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", diff --git a/tox.ini b/tox.ini index a4db6d0..014e60b 100644 --- a/tox.ini +++ b/tox.ini @@ -3,14 +3,13 @@ skip_missing_interpreters=true envlist = cov-clean, lint, - {py36,py37,py38,py39,py310}-{requests,httplib2,urllib3,tornado4,boto3,aiohttp,httpx}, + {py37,py38,py39,py310}-{requests,httplib2,urllib3,tornado4,boto3,aiohttp,httpx}, {pypy3}-{requests,httplib2,urllib3,tornado4,boto3}, cov-report [gh-actions] python = - 3.6: py36 3.7: py37, lint 3.8: py38 3.9: py39 @@ -72,6 +71,7 @@ usedevelop=true commands = ./runtests.sh --cov=./vcr --cov-branch --cov-report=xml --cov-append {posargs} deps = + Werkzeug==2.0.3 pytest pytest-httpbin pytest-cov @@ -80,20 +80,17 @@ deps = requests: requests>=2.22.0 httplib2: httplib2 urllib3: urllib3 - {py36}-tornado4: tornado>=4,<5 - {py36}-tornado4: pytest-tornado - {py36}-tornado4: pycurl boto3: boto3 boto3: urllib3 aiohttp: aiohttp aiohttp: pytest-asyncio aiohttp: pytest-aiohttp httpx: httpx - {py36,py37,py38,py39,py310}-{httpx}: httpx - {py36,py37,py38,py39,py310}-{httpx}: pytest-asyncio + {py37,py38,py39,py310}-{httpx}: httpx + {py37,py38,py39,py310}-{httpx}: pytest-asyncio depends = - lint,{py36,py37,py38,py39,py310,pypy3}-{requests,httplib2,urllib3,tornado4,boto3},{py36,py37,py38,py39,py310}-{aiohttp},{py36,py37,py38,py39,py310}-{httpx}: cov-clean - cov-report: lint,{py36,py37,py38,py39,py310,pypy3}-{requests,httplib2,urllib3,tornado4,boto3},{py36,py37,py38,py39,py310}-{aiohttp} + lint,{py37,py38,py39,py310,pypy3}-{requests,httplib2,urllib3,tornado4,boto3},{py37,py38,py39,py310}-{aiohttp},{py37,py38,py39,py310}-{httpx}: cov-clean + cov-report: lint,{py37,py38,py39,py310,pypy3}-{requests,httplib2,urllib3,tornado4,boto3},{py37,py38,py39,py310}-{aiohttp} passenv = AWS_ACCESS_KEY_ID AWS_DEFAULT_REGION