Merge pull request #148 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 }}

MANIFEST.in

@@ -1,2 +1,2 @@
-include HISTORY.rst README.rst LICENSE geoip2/py.typed requirements.txt tests/*.py tests/data/test-data/*.mmdb
+include HISTORY.rst README.rst LICENSE geoip2/py.typed tests/*.py tests/data/test-data/*.mmdb
 graft docs/html

requirements.txt

@@ -1,7 +1,51 @@
+[metadata]
+name = geoip2
+author = Gregory Oschwald
+author_email = goschwald@maxmind.com
+license = Apache License, Version 2.0
+description = MaxMind GeoIP2 API
+url = http://www.maxmind.com/
+long_description = file: README.rst
+classifiers =
+    Development Status :: 5 - Production/Stable
+    Environment :: Web Environment
+    Intended Audience :: Developers
+    Intended Audience :: System Administrators
+    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
+project_urls =
+    Documentation = https://geoip2.readthedocs.org/
+    Source Code = https://github.com/maxmind/GeoIP2-python
+    Issue Tracker = https://github.com/maxmind/GeoIP2-python/issues
+
+[options]
+package_dir =
+    geoip2 = geoip2
+packages = geoip2
+install_requires =
+    aiohttp>=3.6.2,<4.0.0
+    maxminddb>=2.3.0,<3.0.0
+    requests>=2.24.0,<3.0.0
+include_package_data = True
+python_requires = >=3.7
+test_suite = tests
+tests_require = mocket>=3.11.1
+
 [flake8]
 # black uses 88 : ¯\_(ツ)_/¯
 max-line-length = 88
 
+[options.package_data]
+geoip2 = py.typed
+
 [wheel]
 universal = 1
 
@@ -26,14 +70,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.cfg

@@ -1,52 +1,9 @@
 #!/usr/bin/env python
 
-import codecs
-import os
-import sys
-
 import geoip2
 
 from setuptools import setup
 
-packages = ["geoip2"]
-
-requirements = [i.strip() for i in open("requirements.txt").readlines()]
-
 setup(
-    name="geoip2",
     version=geoip2.__version__,
-    description="MaxMind GeoIP2 API",
-    long_description=codecs.open("README.rst", "r", "utf-8").read(),
-    author="Gregory Oschwald",
-    author_email="goschwald@maxmind.com",
-    url="http://www.maxmind.com/",
-    packages=["geoip2"],
-    package_data={"": ["LICENSE"], "geoip2": ["py.typed"]},
-    package_dir={"geoip2": "geoip2"},
-    include_package_data=True,
-    python_requires=">=3.7",
-    install_requires=requirements,
-    tests_require=["mocket>=3.11.0"],
-    test_suite="tests",
-    license=geoip2.__license__,
-    classifiers=[
-        "Development Status :: 5 - Production/Stable",
-        "Environment :: Web Environment",
-        "Intended Audience :: Developers",
-        "Intended Audience :: System Administrators",
-        "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",
-    ],
-    project_urls={
-        "Documentation": "https://geoip2.readthedocs.org/",
-        "Source Code": "https://github.com/maxmind/GeoIP2-python",
-        "Issue Tracker": "https://github.com/maxmind/GeoIP2-python/issues",
-    },
 )