Moved the metadata into setup.cfg from setup.py.

Fixed the dependency on poetry instead of poetry-core in pyproject.toml.
Fetching the version from git tags now when using setuptools (for poetry we cannot do that currently, see https://github.com/python-poetry/poetry/issues/693).

diff --git a/pyproject.toml b/pyproject.toml
index c824f0e781ff51f78814629e53c12c83849b182a..6c88e44e2787f57b7e6b0f769c3dd8a1b3c0e5f5 100644 (file)
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -36,5 +36,7 @@ trio = ['trio']
 curio = ['curio', 'sniffio']
 
 [build-system]
-requires = ["poetry>=0.12"]
-build-backend = "poetry.masonry.api"
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.setuptools_scm]
\ No newline at end of file

diff --git a/setup.cfg b/setup.cfg
index 0c9e0fc1447e98b7f63ae8c9eb552c2af7b83f45..be56502a1c59717e2bac5ad26328c4b1cbdde9cd 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,54 @@
 [metadata]
+name = dnspython
+author = Bob Halley
+author_email = halley@dnspython.org
+license = ISC
 license_file = LICENSE
+description = DNS toolkit
+url = http://www.dnspython.org
+long_description = dnspython is a DNS toolkit for Python. It supports almost all
+    record types. It can be used for queries, zone transfers, and dynamic
+    updates.  It supports TSIG authenticated messages and EDNS0.
+
+    dnspython provides both high and low level access to DNS. The high
+    level classes perform queries for data of a given name, type, and
+    class, and return an answer set.  The low level classes allow
+    direct manipulation of DNS zones, messages, names, and records.
+long_description_content_type = text/plain
+classifiers =
+    Development Status :: 5 - Production/Stable
+    Intended Audience :: Developers
+    Intended Audience :: System Administrators
+    License :: OSI Approved :: ISC License (ISCL)
+    Operating System :: POSIX
+    Operating System :: Microsoft :: Windows
+    Programming Language :: Python
+    Topic :: Internet :: Name Service (DNS)
+    Topic :: Software Development :: Libraries :: Python Modules
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+provides = dns
+
+[options]
+packages =
+    dns
+    dns.rdtypes
+    dns.rdtypes.IN
+    dns.rdtypes.ANY
+    dns.rdtypes.CH
+python_requires = >=3.6
+test_suite = tests
+setup_requires = setuptools>=44; wheel; setuptools_scm[toml]>=3.4.3
+
+[options.extras_require]
+DOH = requests; requests-toolbelt
+IDNA = idna>=2.1
+DNSSEC = cryptography>=2.6
+trio = trio>=0.14.0; sniffio>=1.1
+curio = curio>=1.2; sniffio>=1.1
+
+[options.package_data]
+dns = py.typed

diff --git a/setup.py b/setup.py
index c2412e6dbee06268ad1a3afb8bb7bb7f436789bd..42e794bc6ad4c01c6dee7b47eb8c4e92b3459a86 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -20,12 +20,11 @@
 import sys
 from setuptools import setup
 
-version = '2.2.0'
 
 try:
-    sys.argv.remove("--cython-compile")
+   sys.argv.remove("--cython-compile")
 except ValueError:
-    compile_cython = False
+   compile_cython = False
 else:
     compile_cython = True
     from Cython.Build import cythonize
@@ -33,51 +32,6 @@ else:
                             language_level='3')
 
 kwargs = {
-    'name' : 'dnspython',
-    'version' : version,
-    'description' : 'DNS toolkit',
-    'long_description' : \
-    """dnspython is a DNS toolkit for Python. It supports almost all
-record types. It can be used for queries, zone transfers, and dynamic
-updates.  It supports TSIG authenticated messages and EDNS0.
-
-dnspython provides both high and low level access to DNS. The high
-level classes perform queries for data of a given name, type, and
-class, and return an answer set.  The low level classes allow
-direct manipulation of DNS zones, messages, names, and records.""",
-    'author' : 'Bob Halley',
-    'author_email' : 'halley@dnspython.org',
-    'license' : 'ISC',
-    'url' : 'http://www.dnspython.org',
-    'packages' : ['dns', 'dns.rdtypes', 'dns.rdtypes.IN', 'dns.rdtypes.ANY',
-                  'dns.rdtypes.CH'],
-    'package_data' : {'dns': ['py.typed']},
-    'classifiers' : [
-        "Development Status :: 5 - Production/Stable",
-        "Intended Audience :: Developers",
-        "Intended Audience :: System Administrators",
-        "License :: OSI Approved :: ISC License (ISCL)",
-        "Operating System :: POSIX",
-        "Operating System :: Microsoft :: Windows",
-        "Programming Language :: Python",
-        "Topic :: Internet :: Name Service (DNS)",
-        "Topic :: Software Development :: Libraries :: Python Modules",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        ],
-    'python_requires': '>=3.6',
-    'test_suite': 'tests',
-    'provides': ['dns'],
-    'extras_require': {
-        'DOH': ['requests', 'requests-toolbelt'],
-        'IDNA': ['idna>=2.1'],
-        'DNSSEC': ['cryptography>=2.6'],
-        'trio': ['trio>=0.14.0', 'sniffio>=1.1'],
-        'curio': ['curio>=1.2', 'sniffio>=1.1'],
-        },
     'ext_modules': ext_modules if compile_cython else None,
     'zip_safe': False if compile_cython else None,
     }