pkg-about 2.0.2__tar.gz → 2.0.4__tar.gz

{pkg_about-2.0.2 → pkg_about-2.0.4}/CHANGES.rst

@@ -1,7 +1,7 @@
 Changelog
 =========
 
-2.0.2 (2025-10-10)
+2.0.4 (2025-11-08)
 ------------------
 - | Now about() and about_from_setup() return an instance of the adict
   | dictionary with about info (but backward compatibility is preserved).
@@ -9,6 +9,7 @@ Changelog
   | instead of a class (but backward compatibility is preserved).
 - | Workaround for the tox error when pyproject.toml and setup.cfg
   | files coexist.
+- Better parsing of newer metadata versions.
 - Mark the package as typed.
 - Add tox's tool.tox.env.cleanup testenv.
 - Setup (dependencies) update.

{pkg_about-2.0.2 → pkg_about-2.0.4}/PKG-INFO

@@ -1,11 +1,9 @@
 Metadata-Version: 2.4
 Name: pkg_about
-Version: 2.0.2
+Version: 2.0.4
 Summary: Shares Python package metadata at runtime.
-Author: Adam Karpierz
-Author-email: adam@karpierz.net
-Maintainer: Adam Karpierz
-Maintainer-email: adam@karpierz.net
+Author-email: Adam Karpierz <adam@karpierz.net>
+Maintainer-email: Adam Karpierz <adam@karpierz.net>
 License-Expression: Zlib
 Project-URL: Homepage, https://pypi.org/project/pkg-about/
 Project-URL: Documentation, https://pkg-about.readthedocs.io/
@@ -49,6 +47,7 @@ Requires-Dist: nbsphinx>=0.9.7; extra == "doc"
 Provides-Extra: test
 Requires-Dist: deepdiff>=8.6.1; extra == "test"
 Requires-Dist: rich>=14.2.0; extra == "test"
+Requires-Dist: appdirs==1.4.4; extra == "test"
 Dynamic: license-file
 
 pkg_about
@@ -145,7 +144,7 @@ Authors
 Changelog
 =========
 
-2.0.2 (2025-10-10)
+2.0.4 (2025-11-08)
 ------------------
 - | Now about() and about_from_setup() return an instance of the adict
   | dictionary with about info (but backward compatibility is preserved).
@@ -153,6 +152,7 @@ Changelog
   | instead of a class (but backward compatibility is preserved).
 - | Workaround for the tox error when pyproject.toml and setup.cfg
   | files coexist.
+- Better parsing of newer metadata versions.
 - Mark the package as typed.
 - Add tox's tool.tox.env.cleanup testenv.
 - Setup (dependencies) update.

{pkg_about-2.0.2 → pkg_about-2.0.4}/pyproject.toml

@@ -7,15 +7,13 @@ requires = ['setuptools>=80.9.0', 'packaging>=25.0.0', 'tox>=4.32.0']
 
 [project]
 name        = 'pkg_about'
-version     = '2.0.2'
+version     = '2.0.4'
 description = 'Shares Python package metadata at runtime.'
 authors = [
-    { name  = 'Adam Karpierz' },
-    { email = 'adam@karpierz.net' },
+    { name  = 'Adam Karpierz', email = 'adam@karpierz.net' },
 ]
 maintainers = [
-    { name  = 'Adam Karpierz' },
-    { email = 'adam@karpierz.net' },
+    { name  = 'Adam Karpierz', email = 'adam@karpierz.net' },
 ]
 license = 'Zlib'
 license-files = ['LICENSE']
@@ -66,6 +64,7 @@ optional-dependencies.'doc' = [
 optional-dependencies.'test' = [
     'deepdiff>=8.6.1',
     'rich>=14.2.0',
+    'appdirs==1.4.4',
 ]
 
 [project.scripts]
@@ -253,7 +252,7 @@ commands = [
 ]
 deps = [
     {replace='ref',of=['tool','tox','env_run_base','deps'],extend=true},
-    'coverage>=7.11.0',
+    'coverage>=7.11.1',
     'covdefaults>=2.3.0',
     'diff-cover>=9.7.1',
 ]

{pkg_about-2.0.2 → pkg_about-2.0.4}/src/pkg_about/_about.py

@@ -3,9 +3,17 @@
 
 __all__ = ('about', 'about_from_setup')
 
+import sys
 from typing import Any
 from pathlib import Path
 from collections import namedtuple
+from functools import partial
+from email.utils import getaddresses, parseaddr
+
+if sys.version_info >= (3, 12):
+    getaddresses = partial(getaddresses, strict=False)
+    parseaddr    = partial(parseaddr,    strict=False)
+else: pass  # pragma: no cover
 
 version_info = namedtuple("version_info",
                           ["major", "minor", "micro", "releaselevel", "serial"],
@@ -16,8 +24,7 @@ class __adict(dict[str, Any]):
     __getattr__ = dict.__getitem__
     __setattr__ = dict.__setitem__
     __delattr__ = dict.__delitem__
-    __copy__ = lambda self: self.__class__(self)
-    copy     = lambda self: self.copy()
+    copy = __copy__ = lambda self: self.__class__(self)
 
 
 def about(package: str | None = None) -> __adict:
@@ -58,14 +65,28 @@ def about(package: str | None = None) -> __adict:
                             or project_urls.get("Homepage")
                             or project_urls.get("Home")),
         __author__       = metadata_get("Author"),
-        __email__        = metadata_get("Author-email"),
         __author_email__ = metadata_get("Author-email"),
         __maintainer__       = metadata_get("Maintainer"),
         __maintainer_email__ = metadata_get("Maintainer-email"),
         __license__      = (metadata_get("License-Expression")
                             or metadata_get("License")),
-        __copyright__    = metadata_get("Author"),
     )
+    email = pkg_metadata["__author_email__"] or ""
+    names = ", ".join(name for name, _ in getaddresses([email]) if name)
+    if names:
+        if not pkg_metadata["__author__"]:
+            pkg_metadata["__author__"] = names
+        else:  # pragma: no cover
+            pkg_metadata["__author__"] += ", " + names
+    email = pkg_metadata["__maintainer_email__"] or ""
+    names = ", ".join(name for name, _ in getaddresses([email]) if name)
+    if names:
+        if not pkg_metadata["__maintainer__"]:
+            pkg_metadata["__maintainer__"] = names
+        else:  # pragma: no cover
+            pkg_metadata["__maintainer__"] += ", " + names
+    pkg_metadata["__email__"] = pkg_metadata["__author_email__"]
+    pkg_metadata["__copyright__"] = pkg_metadata["__author__"]
 
     pkg_globals.update(pkg_metadata)
     pkg_globals.setdefault("__all__", [])
@@ -110,6 +131,9 @@ def about_from_setup(package_path: Path | str | None = None) -> __adict:
     version = parse_version(metadata["version"])
     adict, get, release_levels = __adict, __get, __release_levels
 
+    authors     = get(metadata, "authors") or []
+    maintainers = get(metadata, "maintainers") or []
+
     pkg_metadata = adict(
         __title__        = metadata["name"],
         __version__      = str(version),
@@ -131,21 +155,31 @@ def about_from_setup(package_path: Path | str | None = None) -> __adict:
                             or get(metadata, "urls", "Homepage")
                             or get(metadata, "urls", "Home")
                             or get(metadata, "url")),
-        __author__       = (get(metadata, "authors", 0, "name")
+        __author__       = (", ".join(item["name"] for item in authors
+                                      if item and "name" in item)
                             or get(metadata, "author")),
-        __email__        = (get(metadata, "authors", 1, "email")
-                            or get(metadata, "author_email")),
-        __author_email__ = (get(metadata, "authors", 1, "email")
+        __author_email__ = (", ".join((f"{item['name']} <{item['email']}>"
+                                       if "name" in item and not parseaddr(
+                                          item["email"])[0]
+                                       else item["email"])
+                                      for item in authors
+                                      if item and "email" in item)
                             or get(metadata, "author_email")),
-        __maintainer__       = (get(metadata, "maintainers", 0, "name")
-                                or get(metadata, "maintainer")),
-        __maintainer_email__ = (get(metadata, "maintainers", 1, "email")
+        __maintainer__   = (", ".join(item["name"] for item in maintainers
+                                      if item and "name"  in item)
+                            or get(metadata, "maintainer")),
+        __maintainer_email__ = (", ".join((f"{item['name']} <{item['email']}>"
+                                           if "name" in item and not parseaddr(
+                                              item["email"])[0]
+                                           else item["email"])
+                                          for item in maintainers
+                                          if item and "email" in item)
                                 or get(metadata, "maintainer_email")),
         __license__      = (get(metadata, "license", "text")
                             or get(metadata, "license")),
-        __copyright__    = (get(metadata, "authors", 0, "name")
-                            or get(metadata, "author")),
     )
+    pkg_metadata["__email__"] = pkg_metadata["__author_email__"]
+    pkg_metadata["__copyright__"] = pkg_metadata["__author__"]
 
     pkg_globals["about"] = pkg_metadata
     pkg_globals.setdefault("__all__", [])

{pkg_about-2.0.2 → pkg_about-2.0.4}/src/pkg_about.egg-info/PKG-INFO

@@ -1,11 +1,9 @@
 Metadata-Version: 2.4
 Name: pkg_about
-Version: 2.0.2
+Version: 2.0.4
 Summary: Shares Python package metadata at runtime.
-Author: Adam Karpierz
-Author-email: adam@karpierz.net
-Maintainer: Adam Karpierz
-Maintainer-email: adam@karpierz.net
+Author-email: Adam Karpierz <adam@karpierz.net>
+Maintainer-email: Adam Karpierz <adam@karpierz.net>
 License-Expression: Zlib
 Project-URL: Homepage, https://pypi.org/project/pkg-about/
 Project-URL: Documentation, https://pkg-about.readthedocs.io/
@@ -49,6 +47,7 @@ Requires-Dist: nbsphinx>=0.9.7; extra == "doc"
 Provides-Extra: test
 Requires-Dist: deepdiff>=8.6.1; extra == "test"
 Requires-Dist: rich>=14.2.0; extra == "test"
+Requires-Dist: appdirs==1.4.4; extra == "test"
 Dynamic: license-file
 
 pkg_about
@@ -145,7 +144,7 @@ Authors
 Changelog
 =========
 
-2.0.2 (2025-10-10)
+2.0.4 (2025-11-08)
 ------------------
 - | Now about() and about_from_setup() return an instance of the adict
   | dictionary with about info (but backward compatibility is preserved).
@@ -153,6 +152,7 @@ Changelog
   | instead of a class (but backward compatibility is preserved).
 - | Workaround for the tox error when pyproject.toml and setup.cfg
   | files coexist.
+- Better parsing of newer metadata versions.
 - Mark the package as typed.
 - Add tox's tool.tox.env.cleanup testenv.
 - Setup (dependencies) update.

{pkg_about-2.0.2 → pkg_about-2.0.4}/src/pkg_about.egg-info/requires.txt

@@ -18,3 +18,4 @@ nbsphinx>=0.9.7
 [test]
 deepdiff>=8.6.1
 rich>=14.2.0
+appdirs==1.4.4

{pkg_about-2.0.2 → pkg_about-2.0.4}/tests/test_main.py

@@ -58,13 +58,13 @@ class MainTestCase(unittest.TestCase):
         self.assertIs(__author__, about.__author__)
         self.assertEqual(about.__author__, "Adam Karpierz")
         self.assertIs(__email__, about.__email__)
-        self.assertEqual(about.__email__, "adam@karpierz.net")
+        self.assertEqual(about.__email__, about.__author_email__)
         self.assertIs(__author_email__, about.__author_email__)
-        self.assertEqual(about.__author_email__, "adam@karpierz.net")
+        self.assertEqual(about.__author_email__, "Adam Karpierz <adam@karpierz.net>")
         self.assertIs(__maintainer__, about.__maintainer__)
         self.assertEqual(about.__maintainer__, "Adam Karpierz")
         self.assertIs(__maintainer_email__, about.__maintainer_email__)
-        self.assertEqual(about.__maintainer_email__, "adam@karpierz.net")
+        self.assertEqual(about.__maintainer_email__, "Adam Karpierz <adam@karpierz.net>")
         self.assertIs(__license__, about.__license__)
         self.assertEqual(about.__license__, "Zlib")
         self.assertIs(__copyright__, about.__copyright__)
@@ -88,12 +88,46 @@ class MainTestCase(unittest.TestCase):
             self.assertEqual(about.__summary__, "Shares Python package metadata at runtime.")
             self.assertEqual(about.__uri__, "https://pypi.org/project/pkg-about/")
             self.assertEqual(about.__author__, "Adam Karpierz")
-            self.assertEqual(about.__email__, "adam@karpierz.net")
-            self.assertEqual(about.__author_email__, "adam@karpierz.net")
+            self.assertEqual(about.__email__, about.__author_email__)
+            self.assertEqual(about.__author_email__, "Adam Karpierz <adam@karpierz.net>")
             self.assertEqual(about.__maintainer__, "Adam Karpierz")
-            self.assertEqual(about.__maintainer_email__, "adam@karpierz.net")
+            self.assertEqual(about.__maintainer_email__, "Adam Karpierz <adam@karpierz.net>")
             self.assertEqual(about.__license__, "Zlib")
             self.assertEqual(about.__copyright__, about.__author__)
         finally:
             os.chmod(setup_cfg, stat.S_IWRITE)
             setup_cfg.unlink()
+
+    def test_about_appdirs(self):
+        about = pkg_about.about("appdirs")
+        self.assertIsInstance(about, dict)
+        self.assertIs(__title__, about.__title__)
+        self.assertEqual(about.__title__, "appdirs")
+        self.assertIs(__version__, about.__version__)
+        self.assertEqual(about.__version__, "1.4.4")
+        self.assertIs(__version_info__, about.__version_info__)
+        self.assertTrue(self.is_namedtuple_instance(about.__version_info__))
+        self.assertEqual(about.__version_info__.major, 1)
+        self.assertEqual(about.__version_info__.minor, 4)
+        self.assertEqual(about.__version_info__.micro, 4)
+        self.assertEqual(about.__version_info__.releaselevel, "final")
+        self.assertEqual(about.__version_info__.serial, 0)
+        self.assertIs(__summary__, about.__summary__)
+        self.assertEqual(about.__summary__, ('A small Python module for determining appropriate'
+                                             ' platform-specific dirs, e.g. a "user data dir".'))
+        self.assertIs(__uri__, about.__uri__)
+        self.assertEqual(about.__uri__, "http://github.com/ActiveState/appdirs")
+        self.assertIs(__author__, about.__author__)
+        self.assertEqual(about.__author__, "Trent Mick")
+        self.assertIs(__email__, about.__email__)
+        self.assertEqual(about.__email__, about.__author_email__)
+        self.assertIs(__author_email__, about.__author_email__)
+        self.assertEqual(about.__author_email__, "trentm@gmail.com")
+        self.assertIs(__maintainer__, about.__maintainer__)
+        self.assertEqual(about.__maintainer__, "Jeff Rouse")
+        self.assertIs(__maintainer_email__, about.__maintainer_email__)
+        self.assertEqual(about.__maintainer_email__, "jr@its.to")
+        self.assertIs(__license__, about.__license__)
+        self.assertEqual(about.__license__, "MIT")
+        self.assertIs(__copyright__, about.__copyright__)
+        self.assertEqual(about.__copyright__, __author__)