From 863d10e71f65617abf63a9d3b80b6c4ae41957b2 Mon Sep 17 00:00:00 2001
From: Martin Fischer <martin@push-f.com>
Date: Tue, 8 Feb 2022 06:09:31 +0100
Subject: combine packages.txt & overrides.toml to packages.toml

---
 packages.toml | 44 ++++++++++++++++++++++++++++++++++++++++++++
 packages.txt  | 22 ----------------------
 pydoc.py      | 12 +++++-------
 3 files changed, 49 insertions(+), 29 deletions(-)
 create mode 100644 packages.toml
 delete mode 100644 packages.txt

diff --git a/packages.toml b/packages.toml
new file mode 100644
index 0000000..8054cef
--- /dev/null
+++ b/packages.toml
@@ -0,0 +1,44 @@
+[babel]
+
+[beautifulsoup4]
+
+[bottle]
+
+[click]
+
+[django]
+
+[docutils]
+
+[flask]
+
+[httpx]
+
+[jinja2]
+
+[lxml]
+
+[mako]
+
+[markdown]
+
+[mistletoe]
+
+[numpy]
+
+[pydoctor]
+docformat = "epytext"
+
+[pygments]
+
+[requests]
+
+[scrapy]
+
+[setuptools]
+
+[sphinx]
+
+[sqlalchemy]
+
+[werkzeug]
diff --git a/packages.txt b/packages.txt
deleted file mode 100644
index 4aac69a..0000000
--- a/packages.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-babel
-beautifulsoup4
-bottle
-click
-django
-docutils
-flask
-httpx
-jinja2
-lxml
-mako
-markdown
-mistletoe
-numpy
-pydoctor
-pygments
-requests
-scrapy
-setuptools
-sphinx
-sqlalchemy
-werkzeug
diff --git a/pydoc.py b/pydoc.py
index fe2a13c..50c002b 100755
--- a/pydoc.py
+++ b/pydoc.py
@@ -79,9 +79,10 @@ if __name__ == '__main__':
 
     package_infos = {}
 
-    for package_name in (
-        pkg_resources.resource_string(__name__, 'packages.txt').decode().splitlines()
-    ):
+    with open('packages.toml') as f:
+        packages = toml.load(f)
+
+    for package_name in packages:
         package = fetch_package_info(package_name)
         package_infos[package_name] = package
         version = package['info']['version']
@@ -144,9 +145,6 @@ if __name__ == '__main__':
 
     shutil.rmtree(download_dir)
 
-    with open('overrides.toml') as f:
-        overrides = toml.load(f)
-
     # 2. generate docs with pydoctor
 
     dist = Path('dist')
@@ -169,7 +167,7 @@ if __name__ == '__main__':
                 f"[warning] found multiple packages for {package_name} ({package_paths}), we're just using the first one"
             )
 
-        docformat = overrides['docformat'].get(package_name, 'restructuredtext')
+        docformat = packages[package_name].get('docformat', 'restructuredtext')
 
         out_dir = dist / package_name / version
 
-- 
cgit v1.2.3