Merge pull request #119 from maxmind/greg/upgrade-mocket

Upgrade to mocket with urllib3 >=2 fix

Author: shadromani

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
         # We don't test on Windows currently as it appears mocket may not
         # work there.
         platform: [ubuntu-latest, macos-latest]
-        python-version: [3.7, 3.8, 3.9, "3.10"]
+        python-version: [3.7, 3.8, 3.9, "3.10", 3.11]
 
     name: Python ${{ matrix.python-version }} on ${{ matrix.platform }}
     runs-on: ${{ matrix.platform }}

setup.cfg

@@ -1,10 +1,55 @@
+[metadata]
+name = minfraud
+author = Gregory Oschwald
+author_email = goschwald@maxmind.com
+license = Apache License 2.0
+description = MaxMind minFraud Score, Insights, Factors and Report Transactions API
+url = https://www.maxmind.com/
+long_description = file: README.rst
+classifiers =
+    Development Status :: 5 - Production/Stable
+    Environment :: Web Environment
+    Intended Audience :: Developers
+    License :: OSI Approved :: Apache Software License
+    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
+    Programming Language :: Python
+    Topic :: Internet :: Proxy Servers
+    Topic :: Internet :: WWW/HTTP
+    Topic :: Internet
+platforms = any
+project_urls =
+    Documentation = https://minfraud.readthedocs.org/
+    Source Code = https://github.com/maxmind/minfraud-api-python
+    Issue Tracker = https://github.com/maxmind/minfraud-api-python/issues
+
 [flake8]
 # black uses 88 : ¯\_(ツ)_/¯
 max-line-length = 88
 
+[options]
+packages = minfraud
+install_requires =
+    aiohttp>=3.6.2,<4.0.0
+    email_validator>=1.1.1,<3.0.0
+    geoip2>=4.7.0,<5.0.0
+    requests>=2.24.0,<3.0.0
+    voluptuous
+include_package_data = True
+python_requires = >=3.7
+test_suite = tests
+tests_require = mocket>=3.11.1
+
 [wheel]
 universal = 1
 
+[options.package_data]
+minfraud = py.typed
+
 [tox:tox]
 envlist = {py37,py38,py39,py310}-test,py310-{black,lint,flake8,mypy}
 
@@ -23,14 +68,11 @@ deps =
     # explicitly require indirect dependency to fix build failure.
     # This can be removed when aiohttp 3.9 is released.
     charset-normalizer==2.1.1
-    # This is to work around https://github.com/mindflayer/python-mocket/issues/199
-    # It can be removed once that is fixed.
-    urllib3==1.26.15
 commands = pytest tests
 
 [testenv:py310-black]
 deps = black
-commands =  black --check --diff .
+commands = black --check --diff .
 
 [testenv:py310-lint]
 deps = pylint

setup.py

@@ -2,9 +2,7 @@
 
 import ast
 import io
-import os
 import re
-import sys
 
 from setuptools import setup
 
@@ -13,52 +11,6 @@
 with io.open("minfraud/version.py", "r", encoding="utf-8") as f:
     _version = str(ast.literal_eval(_version_re.search(f.read()).group(1)))
 
-with io.open("README.rst", "r", encoding="utf-8") as f:
-    _readme = f.read()
-
-requirements = [
-    "aiohttp>=3.6.2,<4.0.0",
-    "email_validator>=1.1.1,<3.0.0",
-    "geoip2>=4.7.0,<5.0.0",
-    "requests>=2.24.0,<3.0.0",
-    "voluptuous",
-]
-
 setup(
-    name="minfraud",
     version=_version,
-    description="MaxMind minFraud Score, Insights, Factors and Report Transactions API",
-    long_description=_readme,
-    author="Gregory Oschwald",
-    author_email="goschwald@maxmind.com",
-    url="https://www.maxmind.com/",
-    packages=["minfraud"],
-    package_data={"minfraud": ["py.typed"]},
-    include_package_data=True,
-    platforms="any",
-    python_requires=">=3.7",
-    install_requires=requirements,
-    tests_require=["mocket>=3.8.6"],
-    test_suite="tests",
-    license="Apache License 2.0 ",
-    classifiers=[
-        "Development Status :: 5 - Production/Stable",
-        "Environment :: Web Environment",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: Apache Software License",
-        "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",
-        "Topic :: Internet :: Proxy Servers",
-        "Topic :: Internet :: WWW/HTTP",
-        "Topic :: Internet",
-    ],
-    project_urls={
-        "Documentation": "https://minfraud.readthedocs.org/",
-        "Source Code": "https://github.com/maxmind/minfraud-api-python",
-        "Issue Tracker": "https://github.com/maxmind/minfraud-api-python/issues",
-    },
 )