Merge pull request #332 from secynic/dev

v1.3.0
secynic · Oct 15, 2024 · b8c79c4 · b8c79c4
2 parents 4e567d4 + 3c06ebe
commit b8c79c4
Show file tree

Hide file tree

Showing 18 changed files with 72 additions and 109 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2020 Philip Hane
+Copyright (c) 2013-2024 Philip Hane
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/ipwhois/__init__.py b/ipwhois/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2020 Philip Hane
+# Copyright (c) 2013-2024 Philip Hane
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/ipwhois/asn.py b/ipwhois/asn.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2020 Philip Hane
+# Copyright (c) 2013-2024 Philip Hane
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/ipwhois/docs/source/conf.py b/ipwhois/docs/source/conf.py
@@ -60,7 +60,7 @@
 
 # General information about the project.
 project = 'ipwhois'
-copyright = '2013-2020, Philip Hane'
+copyright = '2013-2024, Philip Hane'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

diff --git a/ipwhois/exceptions.py b/ipwhois/exceptions.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2020 Philip Hane
+# Copyright (c) 2013-2024 Philip Hane
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/ipwhois/hr.py b/ipwhois/hr.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2020 Philip Hane
+# Copyright (c) 2013-2024 Philip Hane
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/ipwhois/ipwhois.py b/ipwhois/ipwhois.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2020 Philip Hane
+# Copyright (c) 2013-2024 Philip Hane
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/ipwhois/net.py b/ipwhois/net.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2020 Philip Hane
+# Copyright (c) 2013-2024 Philip Hane
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/ipwhois/nir.py b/ipwhois/nir.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2020 Philip Hane
+# Copyright (c) 2013-2024 Philip Hane
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/ipwhois/rdap.py b/ipwhois/rdap.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2020 Philip Hane
+# Copyright (c) 2013-2024 Philip Hane
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/ipwhois/scripts/docs/generate_examples.py b/ipwhois/scripts/docs/generate_examples.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2020 Philip Hane
+# Copyright (c) 2013-2024 Philip Hane
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/ipwhois/scripts/ipwhois_cli.py b/ipwhois/scripts/ipwhois_cli.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2020 Philip Hane
+# Copyright (c) 2013-2024 Philip Hane
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/ipwhois/scripts/ipwhois_utils_cli.py b/ipwhois/scripts/ipwhois_utils_cli.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2020 Philip Hane
+# Copyright (c) 2013-2024 Philip Hane
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/ipwhois/utils.py b/ipwhois/utils.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2020 Philip Hane
+# Copyright (c) 2013-2024 Philip Hane
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/ipwhois/whois.py b/ipwhois/whois.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2020 Philip Hane
+# Copyright (c) 2013-2024 Philip Hane
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools", "wheel"]
+build-backend = "setuptools.build_meta"
diff --git a/setup.cfg b/setup.cfg
@@ -1,2 +1,56 @@
+[metadata]
+name = ipwhois
+version = 1.3.0
+author = Philip Hane
+author_email = [email protected]
+license = BSD
+description = Retrieve and parse whois data for IPv4 and IPv6 addresses.
+long_description = file: README.rst, CHANGES.rst
+long_description_content_type = text/x-rst
+keywords =
+    Python, WHOIS, RWhois, Referral Whois, ASN, IP Address, IP, IPv4, IPv6,
+    IETF, REST, Arin, Ripe, Apnic, Lacnic, Afrinic, NIC, National Information
+    Center, RDAP, RIR, Regional Internet Registry, NIR, National Internet
+    Registry, ASN origin, Origin
+url = https://github.com/secynic/ipwhois
+download_url = https://github.com/secynic/ipwhois/tarball/master
+classifiers =
+    Development Status :: 5 - Production/Stable
+    Intended Audience :: Developers
+    Intended Audience :: Information Technology
+    Intended Audience :: Science/Research
+    License :: OSI Approved :: BSD License
+    Operating System :: OS Independent
+    Programming Language :: Python
+    Programming Language :: Python :: 2
+    Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.4
+    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    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 :: 3.12
+    Topic :: Internet
+    Topic :: Software Development
+
+[options]
+packages = ipwhois, ipwhois.scripts
+install_requires =
+    dnspython
+    ipaddr==2.2.0;python_version<"3.3"
+    defusedxml
+
+[options.entry_points]
+console_scripts =
+    ipwhois_cli = ipwhois.scripts.ipwhois_cli:main
+    ipwhois_utils_cli = ipwhois.scripts.ipwhois_utils_cli:main
+
+[options.package_data]
+ipwhois = data/*.xml; data/*.csv
+
 [bdist_wheel]
 universal=1
diff --git a/setup.py b/setup.py