Replace httpretty with requests-mock, update runtimes and add type annotations

.github/workflows/ci-cd.yml

@@ -24,8 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: [
-          "2.7",
-          "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14-dev",
+          "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14-dev",
           "pypy-2.7", "pypy-3.10"
         ]
         os: [ubuntu-latest, macOS-latest, windows-latest]
@@ -43,11 +42,34 @@ jobs:
       run: |
         pytest
 
+  Mypy:
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 10
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: [
+          "3.12"
+        ]
+        os: [ubuntu-latest, macOS-latest, windows-latest]
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        pip install -r test-requirements.txt -r requirements.txt
+    - name: Run tests
+      run: |
+        mypy --check tinify
+
   Integration_tests:
     if: github.event_name == 'push'
     runs-on: ${{ matrix.os }}
     timeout-minutes: 10
-    needs: Unit_tests
+    needs: [Unit_tests, Mypy, Unit_Tests_Py27]
     strategy:
       fail-fast: false
       matrix:

CHANGES.md

@@ -1,3 +1,12 @@
+## 1.7.0
+
+* Added type annotations
+* Updated runtime support
+    * Dropped python 3.7
+    * Added Python 3.12
+    * Added Python 3.13
+* Tests: Replaced httpretty with requests-mock
+
 ## 1.6.0
 * Updated runtime support
     * Dropped 2.6

setup.py

@@ -7,50 +7,46 @@
 except ImportError:
     from distutils.core import setup
 
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'tinify'))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "tinify"))
 from version import __version__
 
-install_require = ['requests >= 2.7.0, < 3.0.0']
-tests_require = ['pytest', 'httpretty < 1.1.5']
+install_require = ["requests >= 2.7.0, < 3.0.0"]
+tests_require = ["pytest", "pytest-xdist", "requests-mock", "types-requests"]
 
-if sys.version_info < (2, 7):
-    tests_require.append('unittest2')
-if sys.version_info < (3, 3):
-    tests_require.append('mock >= 1.3, < 2.0')
+if sys.version_info.major > 2:
+    tests_require.append("mypy")
 
 setup(
-    name='tinify',
+    name="tinify",
     version=__version__,
-    description='Tinify API client.',
-    author='Jacob Middag',
-    author_email='info@tinify.com',
-    license='MIT',
-    long_description='Python client for the Tinify API. Tinify compresses your images intelligently. Read more at https://tinify.com.',
-    long_description_content_type='text/markdown',
-    url='https://tinify.com/developers',
-
-    packages=['tinify'],
+    description="Tinify API client.",
+    author="Jacob Middag",
+    author_email="info@tinify.com",
+    license="MIT",
+    long_description="Python client for the Tinify API. Tinify compresses your images intelligently. Read more at https://tinify.com.",
+    long_description_content_type="text/markdown",
+    url="https://tinify.com/developers",
+    packages=["tinify"],
     package_data={
-        '': ['LICENSE', 'README.md'],
-        'tinify': ['data/cacert.pem'],
+        "": ["LICENSE", "README.md"],
+        "tinify": ["data/cacert.pem", "py.typed"],
     },
-
     install_requires=install_require,
     tests_require=tests_require,
-    extras_require={'test': tests_require},
-
+    extras_require={"test": tests_require},
     classifiers=(
-        'Development Status :: 5 - Production/Stable',
-        'Intended Audience :: Developers',
-        'Natural Language :: English',
-        'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.10',
-        'Programming Language :: Python :: 3.11',
+        "Development Status :: 5 - Production/Stable",
+        "Intended Audience :: Developers",
+        "Natural Language :: English",
+        "License :: OSI Approved :: MIT License",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
+        "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",
     ),
 )