Merge pull request #332 from secynic/dev

v1.3.0
2025-12-10 00:40:57 -06:00 · 2024-10-15 02:59:00 -05:00 · 2024-10-15 02:59:00 -05:00 · b8c79c4e90
commit b8c79c4e90
parent 4e567d4cb2 3c06ebe22e
18 changed files with 72 additions and 109 deletions
--- 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
--- 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
--- 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
--- a/ipwhois/docs/source/conf.py
+++ b/ipwhois/docs/source/conf.py
@ -60,7 +60,7 @@ master_doc = 'index'

 # 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/pyproject.toml
+++ b/pyproject.toml
@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools", "wheel"]
+build-backend = "setuptools.build_meta"
--- a/setup.cfg
+++ b/setup.cfg
@ -1,2 +1,56 @@
+[metadata]
+name = ipwhois
+version = 1.3.0
+author = Philip Hane
+author_email = secynic@gmail.com
+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
--- a/setup.py
+++ b/setup.py
@ -1,94 +0,0 @@
-# Filename: setup.py
-
-from setuptools import setup
-import io
-
-NAME = 'ipwhois'
-VERSION = '1.3.0'
-AUTHOR = 'Philip Hane'
-AUTHOR_EMAIL = 'secynic@gmail.com'
-DESCRIPTION = 'Retrieve and parse whois data for IPv4 and IPv6 addresses.'
-KEYWORDS = ' '.join([
-    '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'
-])
-
-README = io.open(file='README.rst', mode='r', encoding='utf-8').read()
-CHANGES = io.open(file='CHANGES.rst', mode='r', encoding='utf-8').read()
-LONG_DESCRIPTION = '\n\n'.join([README, CHANGES])
-LICENSE = 'BSD'
-
-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',
-]
-
-PACKAGES = ['ipwhois']
-
-PACKAGE_DATA = {'ipwhois': ['data/*.xml', 'data/*.csv']}
-
-INSTALL_REQUIRES = ['dnspython', 'ipaddr==2.2.0;python_version<"3.3"',
-                    'defusedxml']
-
-setup(
-    name=NAME,
-    version=VERSION,
-    author=AUTHOR,
-    author_email=AUTHOR_EMAIL,
-    description=DESCRIPTION,
-    keywords=KEYWORDS,
-    long_description=LONG_DESCRIPTION,
-    license=LICENSE,
-    url=URL,
-    download_url=DOWNLOAD_URL,
-    classifiers=CLASSIFIERS,
-    packages=PACKAGES,
-    package_data=PACKAGE_DATA,
-    install_requires=INSTALL_REQUIRES,
-    scripts=['ipwhois/scripts/ipwhois_cli.py',
-             'ipwhois/scripts/ipwhois_utils_cli.py']
-)