From 0979871ce8e1b7c53d67b324df29377bdb920bed Mon Sep 17 00:00:00 2001
From: deadc0de6 <info@deadc0de.ch>
Date: Fri, 8 Jul 2022 14:29:17 +0200
Subject: [PATCH] remove setup.cfg

---
 .github/workflows/pypi-release.yml |  3 +--
 setup.cfg                          | 11 -----------
 setup.py                           | 13 ++++++-------
 3 files changed, 7 insertions(+), 20 deletions(-)
 delete mode 100644 setup.cfg

diff --git a/.github/workflows/pypi-release.yml b/.github/workflows/pypi-release.yml
index 0536b79..6aea37a 100644
--- a/.github/workflows/pypi-release.yml
+++ b/.github/workflows/pypi-release.yml
@@ -14,9 +14,8 @@ jobs:
     - name: Install Tools
       run: |
         sudo apt update
-        sudo apt -y install python3-pypandoc pandoc
         python -m pip install --upgrade pip
-        pip install setuptools wheel twine pypandoc
+        pip install setuptools wheel twine
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
     - name: Build and Publish
       env:
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 2590684..0000000
--- a/setup.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-[metadata]
-description-file = README.md
-license_file = LICENSE
-
-[bdist_wheel]
-python-tag = py3
-
-[files]
-extra_files =
-  LICENSE
-  README.md
diff --git a/setup.py b/setup.py
index 3fd20ae..4903469 100644
--- a/setup.py
+++ b/setup.py
@@ -5,13 +5,7 @@ import catcli
 
 readme = 'README.md'
 here = path.abspath(path.dirname(__file__))
-
-try:
-    from pypandoc import convert_file
-    read_readme = lambda f: convert_file(f, 'rst')
-except ImportError:
-    print('\n[WARNING] pypandoc not found, could not convert \"{}\"\n'.format(readme))
-    read_readme = lambda f: open(f, 'r').read()
+read_readme = lambda f: open(f, 'r').read()
 
 VERSION = catcli.__version__
 REQUIRES_PYTHON = '>=3'
@@ -22,8 +16,13 @@ setup(
 
     description='The command line catalog tool for your offline data',
     long_description=read_readme(readme),
+    long_description_content_type='text/markdown',
+    license_files = ('LICENSE',),
     url='https://github.com/deadc0de6/catcli',
     download_url = 'https://github.com/deadc0de6/catcli/archive/v'+VERSION+'.tar.gz',
+    options={"bdist_wheel": {"python_tag": "py3"}},
+    # include anything from MANIFEST.in
+    include_package_data=True,
 
     author='deadc0de6',
     author_email='deadc0de6@foo.bar',