Accepting request 986549 from Application:Geo

- Update to version 4.6.0:
  - The AddressNotFoundError class now has an ip_address attribute
    with the lookup address and network property for the empty network
    in the database containing the IP address. These are only available
    when using a database, not the web service. 
- Rebase 0001-Removing-unused-urllib3-dependency-loosening-request.patch

OBS-URL: https://build.opensuse.org/request/show/986549
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-geoip2?expand=0&rev=17
This commit is contained in:
Dominique Leuenberger 2022-07-05 10:27:03 +00:00 committed by Git OBS Bridge
commit 6325a021b8
5 changed files with 40 additions and 30 deletions

View File

@ -13,11 +13,11 @@ Subject: [PATCH] Removing unused urllib3 dependency, loosening requests
setup.py | 5 +++++ setup.py | 5 +++++
6 files changed, 46 insertions(+), 15 deletions(-) 6 files changed, 46 insertions(+), 15 deletions(-)
diff --git a/README.rst b/README.rst Index: geoip2-4.6.0/README.rst
index a17082e..8969781 100644 ===================================================================
--- a/README.rst --- geoip2-4.6.0.orig/README.rst
+++ b/README.rst +++ geoip2-4.6.0/README.rst
@@ -19,6 +19,9 @@ To install the ``geoip2`` module, type: @@ -17,6 +17,9 @@ To install the ``geoip2`` module, type:
.. code-block:: bash .. code-block:: bash
$ pip install geoip2 $ pip install geoip2
@ -27,11 +27,11 @@ index a17082e..8969781 100644
If you are not able to use pip, you may also use easy_install from the If you are not able to use pip, you may also use easy_install from the
source directory: source directory:
diff --git a/geoip2/webservice.py b/geoip2/webservice.py Index: geoip2-4.6.0/geoip2/webservice.py
index 4b1fc15..6ab0e84 100644 ===================================================================
--- a/geoip2/webservice.py --- geoip2-4.6.0.orig/geoip2/webservice.py
+++ b/geoip2/webservice.py +++ geoip2-4.6.0/geoip2/webservice.py
@@ -27,12 +27,21 @@ @@ -27,12 +27,21 @@ Requests to the web service are always m
import ipaddress import ipaddress
import json import json
@ -57,7 +57,7 @@ index 4b1fc15..6ab0e84 100644
import geoip2 import geoip2
import geoip2.models import geoip2.models
@@ -48,13 +57,28 @@ @@ -48,13 +57,28 @@ from geoip2.errors import (
from geoip2.models import City, Country, Insights from geoip2.models import City, Country, Insights
from geoip2.types import IPAddress from geoip2.types import IPAddress
@ -93,20 +93,20 @@ index 4b1fc15..6ab0e84 100644
class BaseClient: # pylint: disable=missing-class-docstring, too-few-public-methods class BaseClient: # pylint: disable=missing-class-docstring, too-few-public-methods
diff --git a/requirements.txt b/requirements.txt Index: geoip2-4.6.0/requirements.txt
index af2c6ff..9c772e4 100644 ===================================================================
--- a/requirements.txt --- geoip2-4.6.0.orig/requirements.txt
+++ b/requirements.txt +++ geoip2-4.6.0/requirements.txt
@@ -1,4 +1 @@ @@ -1,4 +1 @@
-aiohttp>=3.6.2,<4.0.0 -aiohttp>=3.6.2,<4.0.0
maxminddb>=2.2.0,<3.0.0 maxminddb>=2.2.0,<3.0.0
-requests>=2.24.0,<3.0.0 -requests>=2.24.0,<3.0.0
-urllib3>=1.25.2,<2.0.0 -urllib3>=1.25.2,<2.0.0
diff --git a/setup.cfg b/setup.cfg Index: geoip2-4.6.0/setup.cfg
index 9d48adc..c77568d 100644 ===================================================================
--- a/setup.cfg --- geoip2-4.6.0.orig/setup.cfg
+++ b/setup.cfg +++ geoip2-4.6.0/setup.cfg
@@ -22,8 +22,9 @@ @@ -26,8 +26,9 @@ deps =
pytest pytest
mocket mocket
commands = pytest tests commands = pytest tests
@ -117,11 +117,11 @@ index 9d48adc..c77568d 100644
tag_build = tag_build =
tag_date = 0 tag_date = 0
- -
diff --git a/setup.py b/setup.py Index: geoip2-4.6.0/setup.py
index 2194e8f..14b6d99 100644 ===================================================================
--- a/setup.py --- geoip2-4.6.0.orig/setup.py
+++ b/setup.py +++ geoip2-4.6.0/setup.py
@@ -26,6 +26,11 @@ @@ -26,6 +26,11 @@ setup(
include_package_data=True, include_package_data=True,
python_requires=">=3.6", python_requires=">=3.6",
install_requires=requirements, install_requires=requirements,

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b542252e87eb40adc3a2fc0f4e84b514c4c5e04ed46923a3a74d509f25f3103a
size 353124

BIN
python-geoip2-4.6.0.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Jul 4 07:11:02 UTC 2022 - Paolo Stivanin <info@paolostivanin.com>
- Update to version 4.6.0:
- The AddressNotFoundError class now has an ip_address attribute
with the lookup address and network property for the empty network
in the database containing the IP address. These are only available
when using a database, not the web service.
- Rebase 0001-Removing-unused-urllib3-dependency-loosening-request.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 18 19:55:34 UTC 2021 - Sebastian Wagner <sebix+novell.com@sebix.at> Thu Nov 18 19:55:34 UTC 2021 - Sebastian Wagner <sebix+novell.com@sebix.at>

View File

@ -1,7 +1,7 @@
# #
# spec file for package python-geoip2 # spec file for package python-geoip2
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2022 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}} %{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-geoip2 Name: python-geoip2
Version: 4.5.0 Version: 4.6.0
Release: 0 Release: 0
Summary: MaxMind GeoIP2 Python API Summary: MaxMind GeoIP2 Python API
License: Apache-2.0 License: Apache-2.0