Remove vcrpy pinning

.github/workflows/main.yml

@@ -13,12 +13,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - python-version: "3.8"
-            env:
-              TOXENV: "msgpack"
-          - python-version: "3.8"
-            env:
-              TOXENV: "json"
           - python-version: "3.9"
             env:
               TOXENV: "msgpack"
@@ -43,14 +37,21 @@ jobs:
           - python-version: "3.12"
             env:
               TOXENV: "json"
-
-          - python-version: "pypy3.10-v7.3.13"
+          - python-version: "3.13"
             env:
               TOXENV: "msgpack"
-          - python-version: "pypy3.10-v7.3.13"
+          - python-version: "3.13"
             env:
               TOXENV: "json"
 
+          # https://github.com/kevin1024/vcrpy/issues/885
+          # - python-version: "pypy3.11-v7.3.20"
+          #   env:
+          #     TOXENV: "msgpack"
+          # - python-version: "pypy3.11-v7.3.20"
+          #   env:
+          #     TOXENV: "json"
+
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}

.gitignore

@@ -16,3 +16,4 @@ docs/_build
 pytestdebug.log
 .idea
 coverage.xml
+.python-version

README.rst

@@ -14,13 +14,8 @@ Client interface for Scrapinghub API
 .. image:: https://codecov.io/gh/scrapinghub/python-scrapinghub/branch/master/graph/badge.svg
    :target: https://app.codecov.io/gh/scrapinghub/python-scrapinghub
 
-The ``scrapinghub`` is a Python library for communicating with the `Scrapinghub API`_.
-
-
-Requirements
-============
-
-* Python 2.7 or Python 3.5+
+The ``scrapinghub`` is a Python 3.9+ library for communicating with the
+`Scrapinghub API`_.
 
 
 Installation

docs/quickstart.rst

@@ -4,7 +4,7 @@ Quickstart
 Requirements
 ------------
 
-* Python 2.7 or above
+* Python 3.8+
 
 
 Installation

setup.py

@@ -28,17 +28,17 @@
     package_data={'scrapinghub': ['VERSION']},
     install_requires=['requests>=1.0', 'retrying>=1.3.3', 'six>=1.10.0'],
     extras_require={'msgpack': mpack_required},
-    python_requires='>=3.8',
+    python_requires='>=3.9',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Internet :: WWW/HTTP',

tests/requirements-msgpack.txt

@@ -0,0 +1,2 @@
+msgpack>=1.0.0; implementation_name != 'pypy'
+msgpack-pypy>=0.0.2; implementation_name == 'pypy'

tests/requirements.txt

@@ -0,0 +1,5 @@
+mock
+vcrpy
+pytest
+pytest-cov
+responses

tox.ini

@@ -4,14 +4,13 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py{py3,38,39,310,311,312}-{json,msgpack}
+# pypy3 excluded due to https://github.com/kevin1024/vcrpy/issues/885
+envlist = py{39,310,311,312}-{json,msgpack}
 
 [testenv]
 deps =
-    -r{toxinidir}/requirements-base.txt
-    -r{toxinidir}/requirements-test.txt
-    msgpack: -r{toxinidir}/requirements.txt
-    pypy-msgpack: -r{toxinidir}/requirements-pypy.txt
+    -r tests/requirements.txt
+    msgpack: -r tests/requirements-msgpack.txt
 commands = py.test --cov=scrapinghub --cov-report=xml {posargs: scrapinghub tests}
 
 [testenv:docs]