Sync from SUSE:SLFO:1.1 python-geoip2 revision a6e95a27c6dcc3ab4dab5113580a5046

0001-Removing-unused-urllib3-dependency-loosening-request.patch

@@ -0,0 +1,135 @@
+From a3152e9e77850aa741976e7e492ab98b672be536 Mon Sep 17 00:00:00 2001
+From: "Dishy.Dev" <dishy@dev>
+Date: Sun, 8 Nov 2020 08:15:57 +0000
+Subject: [PATCH] Removing unused urllib3 dependency, loosening requests
+ version requirement and making aiohttp and requests optional installs
+
+---
+ .github/workflows/lint.yml |  2 +-
+ README.rst                 |  3 +++
+ geoip2/webservice.py       | 46 +++++++++++++++++++++++++++++---------
+ requirements.txt           |  3 ---
+ setup.cfg                  |  2 ++
+ setup.py                   |  5 +++++
+ 6 files changed, 46 insertions(+), 15 deletions(-)
+
+Index: geoip2-4.6.0/README.rst
+===================================================================
+--- geoip2-4.6.0.orig/README.rst
++++ geoip2-4.6.0/README.rst
+@@ -17,6 +17,9 @@ To install the ``geoip2`` module, type:
+ .. code-block:: bash
+ 
+     $ pip install geoip2
++    $ pip install geoip2[aiohttp]
++    $ pip install geoip2[requests] 
++    $ pip install geoip2[all] # Install both requests and aiohttp support
+ 
+ If you are not able to use pip, you may also use easy_install from the
+ source directory:
+Index: geoip2-4.6.0/geoip2/webservice.py
+===================================================================
+--- geoip2-4.6.0.orig/geoip2/webservice.py
++++ geoip2-4.6.0/geoip2/webservice.py
+@@ -27,12 +27,21 @@ Requests to the web service are always m
+ 
+ import ipaddress
+ import json
++import sys
+ from typing import Any, Dict, cast, List, Optional, Type, Union
+ 
+-import aiohttp
+-import aiohttp.http
+-import requests
+-import requests.utils
++try:
++    import aiohttp
++    import aiohttp.http
++except ImportError:
++    pass
++
++try:
++    import requests
++    import requests.utils
++except ImportError:
++    pass
++
+ 
+ import geoip2
+ import geoip2.models
+@@ -48,13 +57,28 @@ from geoip2.errors import (
+ from geoip2.models import City, Country, Insights
+ from geoip2.types import IPAddress
+ 
+-_AIOHTTP_UA = (
+-    f"GeoIP2-Python-Client/{geoip2.__version__} {aiohttp.http.SERVER_SOFTWARE}"
+-)
+-
+-_REQUEST_UA = (
+-    f"GeoIP2-Python-Client/{geoip2.__version__} {requests.utils.default_user_agent()}"
+-)
++# If neither requests or aiohttp is installed then inform user how to
++# install them
++if "aiohttp" not in sys.modules and "requests" not in sys.modules:
++    raise ImportError(
++        """To enable geoip2.webservice,
++    install aiohttp or requests support.
++        pip install geoip2[aiohttp]
++        pip install geoip2[requests]
++        pip install geoip2[all]"""
++    )
++
++
++if "aiohttp" in sys.modules:
++    _AIOHTTP_UA = (
++        f"GeoIP2-Python-Client/{geoip2.__version__} {aiohttp.http.SERVER_SOFTWARE}"
++    )
++
++if "requests" in sys.modules:
++    _REQUEST_UA = (
++        f"GeoIP2-Python-Client/{geoip2.__version__}"
++        f" {requests.utils.default_user_agent()}"
++    )
+ 
+ 
+ class BaseClient:  # pylint: disable=missing-class-docstring, too-few-public-methods
+Index: geoip2-4.6.0/requirements.txt
+===================================================================
+--- geoip2-4.6.0.orig/requirements.txt
++++ geoip2-4.6.0/requirements.txt
+@@ -1,4 +1 @@
+-aiohttp>=3.6.2,<4.0.0
+ maxminddb>=2.2.0,<3.0.0
+-requests>=2.24.0,<3.0.0
+-urllib3>=1.25.2,<2.0.0
+Index: geoip2-4.6.0/setup.cfg
+===================================================================
+--- geoip2-4.6.0.orig/setup.cfg
++++ geoip2-4.6.0/setup.cfg
+@@ -26,8 +26,9 @@ deps =
+ 	pytest
+ 	mocket
+ commands = pytest tests
++usedevelop = true
++extras = aiohttp, requests
+ 
+ [egg_info]
+ tag_build = 
+ tag_date = 0
+-
+Index: geoip2-4.6.0/setup.py
+===================================================================
+--- geoip2-4.6.0.orig/setup.py
++++ geoip2-4.6.0/setup.py
+@@ -26,6 +26,11 @@ setup(
+     include_package_data=True,
+     python_requires=">=3.6",
+     install_requires=requirements,
++    extras_require={
++        "all": ["requests>=2.14.0,<3.0.0", "aiohttp>=3.6.2,<4.0.0"],
++        "requests": "requests>=2.14.0,<3.0.0",
++        "aiohttp": "aiohttp>=3.6.2,<4.0.0",
++    },
+     tests_require=["mocket>=3.8.9"],
+     test_suite="tests",
+     license=geoip2.__license__,

python-geoip2.changes

@@ -1,17 +1,3 @@
--------------------------------------------------------------------
-Sun Nov 26 10:29:23 UTC 2023 - Dirk Müller <dmueller@suse.com>
-
-- update to 4.7.0:
-  * drop support for python 3.6
-  - drop
-    0001-Removing-unused-urllib3-dependency-loosening-request.patch
-    (upstream)
-
--------------------------------------------------------------------
-Fri Jun  9 11:46:37 UTC 2023 - ecsos <ecsos@opensuse.org>
-
-- Add %{?sle15_python_module_pythons}
-
 -------------------------------------------------------------------
 Wed Feb 15 19:57:56 UTC 2023 - Dirk Müller <dmueller@suse.com>
 

python-geoip2.spec

@@ -16,24 +16,28 @@
 #
 
 
-%{?sle15_python_module_pythons}
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-geoip2
-Version:        4.7.0
+Version:        4.6.0
 Release:        0
 Summary:        MaxMind GeoIP2 Python API
 License:        Apache-2.0
 Group:          Development/Languages/Python
 URL:            https://github.com/maxmind/GeoIP2-python
 Source:         https://files.pythonhosted.org/packages/source/g/geoip2/geoip2-%{version}.tar.gz#/%{name}-%{version}.tar.gz
-BuildRequires:  %{python_module base >= 3.7}
+# PATCH-FIX-OPENSUSE 0001-Removing-unused-urllib3-dependency-loosening-request.patch -- Removing unused urllib3 dependency loosening requests version based on https://github.com/maxmind/GeoIP2-python/pull/104.patch
+Patch0:         0001-Removing-unused-urllib3-dependency-loosening-request.patch
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 # SECTION test requirements
 BuildRequires:  %{python_module aiohttp >= 3.6.2}
-BuildRequires:  %{python_module maxminddb >= 2.3.0}
+BuildRequires:  %{python_module maxminddb >= 2.2.0}
-BuildRequires:  %{python_module mocket >= 3.11.0}
+# mocket currently does not work with 3.11. See these issues:
-BuildRequires:  %{python_module pytest}
+# gh#maxmind/GeoIP2-python@3b0dbb1eb990
+# gh#mindflayer/python-mocket#181
+# gh#benoitc/http-parser#95
+BuildRequires:  %{python_module mocket >= 3.8.9 if %python-base < 3.11}
 BuildRequires:  %{python_module python-magic >= 0.4.18}
 BuildRequires:  %{python_module requests >= 2.14.0}
 # /SECTION
@@ -41,6 +45,9 @@ Recommends:     python-aiohttp >= 3.6.2
 Requires:       python-maxminddb >= 2.0.0
 Requires:       python-requests >= 2.14.0
 BuildArch:      noarch
+%ifpython2
+Recommends:     python2-ipaddress
+%endif
 %python_subpackages
 
 %description
@@ -49,6 +56,7 @@ The API also works with MaxMind's free GeoLite2 databases.
 
 %prep
 %setup -q -n geoip2-%{version}
+%patch0 -p1
 
 %build
 %python_build
@@ -58,8 +66,15 @@ The API also works with MaxMind's free GeoLite2 databases.
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
-rm -v tests/webservice_test.py
+python38_tests="tests/models_test.py tests/database_test.py"
-%pytest
+python39_tests=$python38_tests
+python310_tests=$python38_tests
+# mocket currently does not work with 3.11. See these issues:
+# gh#maxmind/GeoIP2-python@3b0dbb1eb990
+# gh#mindflayer/python-mocket#181
+# gh#benoitc/http-parser#95
+python311_tests="tests/models_test.py tests/database_test.py"
+%pyunittest -v ${$python_tests}
 
 %files %{python_files}
 %license LICENSE