From fd5b2a0d9e8428f4e165272720d7ed43d6e7d20d Mon Sep 17 00:00:00 2001
From: Lucas Cimon <925560+Lucas-C@users.noreply.github.com>
Date: Mon, 10 Jul 2023 15:04:49 +0200
Subject: [PATCH] Fix files included in build distributions - close #843

---
 MANIFEST.in | 18 +++++++-----------
 setup.cfg   | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
 setup.py    | 43 +------------------------------------------
 3 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index ccc3c1738..15c755762 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,14 +1,10 @@
-include           PyPIReadme.rst
+include CHANGELOG.md
+include CONTRIBUTING.md
+include CONTRIBUTORS.md
+include LICENSE
+exclude MANIFEST.in
+include README.md
+
 recursive-include fpdf     *
 recursive-exclude fpdf     *.pyc
-recursive-exclude scripts  *
 recursive-exclude test     *
-recursive-exclude tutorial *
-
-# added by check_manifest.py
-exclude *.md
-exclude *.yml
-include LICENSE
-exclude tox.ini
-
-include README.md
diff --git a/setup.cfg b/setup.cfg
index 81bb971fb..ec7b6a24d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,52 @@
 [metadata]
-description-file = README.md
+name = fpdf2
+url = https://pyfpdf.github.io/fpdf2/
+description = Simple & fast PDF generation for Python
+long_description = file: README.md
+long_description_content_type = text/markdown
+author = Olivier PLATHEY ported by Max
+maintainer = Lucas Cimon
+license = LGPLv3+
+project_urls =
+  Documentation = https://pyfpdf.github.io/fpdf2/
+  Code = https://github.com/PyFPDF/fpdf2
+  Issue tracker = https://github.com/PyFPDF/fpdf2/issues
+classifiers =
+  Development Status :: 5 - Production/Stable
+  Intended Audience :: Developers
+  License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)
+  Programming Language :: Python
+  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
+  Operating System :: OS Independent
+  Topic :: Printing
+  Topic :: Software Development :: Libraries :: Python Modules
+  Topic :: Text Processing :: Markup
+  Topic :: Multimedia :: Graphics
+  Topic :: Multimedia :: Graphics :: Presentation
+keywords =
+  pdf
+  unicode
+  png
+  jpg
+  ttf
+  barcode
 
-[wheel]
+[options]
+packages =
+  fpdf
+install_requires =
+  defusedxml
+  Pillow>=6.2.2,!=9.2.*  # minimum version tested there: https://github.com/PyFPDF/fpdf2/actions/runs/2295868575
+  # Version 9.2.0 is excluded due to DoS vulnerability with TIFF images: https://github.com/PyFPDF/fpdf2/issues/628
+  # Version exclusion explained here: https://devpress.csdn.net/python/630462c0c67703293080c302.html
+  fonttools>=4.34.0
+python_requires = >=3.7
+
+[bdist_wheel]
 universal = 1
 
 [flake8]
diff --git a/setup.py b/setup.py
index 5ca2735d3..aea2f6ca0 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 import re
 from pathlib import Path
 
-from setuptools import find_packages, setup
+from setuptools import setup
 
 
 if __name__ == "__main__":
@@ -10,47 +10,6 @@
         Path("fpdf/fpdf.py").read_text(encoding="utf-8"),
     )[0]
     setup(
-        name="fpdf2",
         version=version,
-        description="Simple & fast PDF generation for Python",
-        long_description=Path("README.md").read_text(encoding="utf-8"),
-        long_description_content_type="text/markdown",
-        author="Olivier PLATHEY ported by Max",
-        maintainer="Lucas Cimon",
-        url="https://pyfpdf.github.io/fpdf2/",
         download_url=f"https://github.com/PyFPDF/fpdf2/tarball/{version}",
-        project_urls={
-            "Documentation": "https://pyfpdf.github.io/fpdf2/",
-            "Code": "https://github.com/PyFPDF/fpdf2",
-            "Issue tracker": "https://github.com/PyFPDF/fpdf2/issues",
-        },
-        license="LGPLv3+",
-        packages=find_packages(),
-        package_dir={"fpdf": "fpdf"},
-        install_requires=[
-            "defusedxml",
-            "Pillow>=6.2.2,!=9.2.*",  # minimum version tested there: https://github.com/PyFPDF/fpdf2/actions/runs/2295868575
-            # Version 9.2.0 is excluded due to DoS vulnerability with TIFF images: https://github.com/PyFPDF/fpdf2/issues/628
-            # Version exclusion explained here: https://devpress.csdn.net/python/630462c0c67703293080c302.html
-            "fonttools>=4.34.0",
-        ],
-        python_requires=">=3.7",
-        classifiers=[
-            "Development Status :: 5 - Production/Stable",
-            "Intended Audience :: Developers",
-            "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
-            "Programming Language :: Python",
-            "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",
-            "Operating System :: OS Independent",
-            "Topic :: Printing",
-            "Topic :: Software Development :: Libraries :: Python Modules",
-            "Topic :: Text Processing :: Markup",
-            "Topic :: Multimedia :: Graphics",
-            "Topic :: Multimedia :: Graphics :: Presentation",
-        ],
-        keywords=["pdf", "unicode", "png", "jpg", "ttf", "barcode"],
     )