Removing pypandoc/pandoc requirement

- Was not working well on manylinux2010 build image
- Not necessary, can use markdown directly now

.github/workflows/manylinux2010.yml

@@ -17,7 +17,7 @@ jobs:
     # capnproto build requires cmake 3+, CentOS 6 (manylinux2010) defaults to cmake 2.8
     - name: Install dependencies
       run: |
-        yum install -y cmake3 ninja-build pandoc
+        yum install -y cmake3 ninja-build
         ln -sf /usr/bin/cmake3 /usr/local/bin/cmake
         ln -s /usr/bin/ninja-build /usr/local/bin/ninja
         /opt/python/${{ matrix.python-version }}/bin/python -m pip install -r requirements.txt

.github/workflows/packagingtest.yml

@@ -17,7 +17,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
-    - uses: r-lib/actions/setup-pandoc@v1
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v1
       with:

CHANGELOG.md

@@ -4,6 +4,7 @@
 - Windows support
 - General cleanup
 - May be incompatible with code written for pycapnp 0.6.4 and lower
+- Removing pypandoc/pandoc packaging requirement
 
 ## v0.6.4 (2019-01-31)
 - Fix bugs in `read_multiple_bytes` (thanks to @tsh56)

Pipfile

@@ -3,12 +3,8 @@ name = "pypi"
 url = "https://pypi.org/simple"
 verify_ssl = true
 
-[dev-packages]
-pypandoc = "*"
-
 [packages]
 pytest = "*"
 tox = "*"
 Jinja2 = "*"
 Cython = "*"
-pypandoc = "*"

requirements.txt

@@ -1,6 +1,5 @@
 jinja2
 cython
 setuptools
-pypandoc
 pytest
 tox

setup.py

@@ -55,17 +55,13 @@ from .lib.capnp import _CAPNP_VERSION as LIBCAPNP_VERSION
 
 write_version_py()
 
-# Try to convert README using pandoc
+# Try to use README.md and CHANGELOG.md as description and changelog
-try:
+with open('README.md', encoding='utf-8') as f:
-    import pypandoc
+    long_description = f.read()
-    long_description = pypandoc.convert_file('README.md', 'rst')
+with open('CHANGELOG.md', encoding='utf-8') as f:
-    changelog = pypandoc.convert_file('CHANGELOG.md', 'rst')
+    changelog = f.read()
-    changelog = '\nChangelog\n=============\n' + changelog
+changelog = '\nChangelog\n=============\n' + changelog
-    long_description += changelog
+long_description += changelog
-except (IOError, ImportError):
-    if sys.argv and sys.argv[-1] == 'sdist':
-        raise
-    long_description = ''
 
 class clean(_clean):
     '''
@@ -200,7 +196,7 @@ setup(
     # PyPi info
     description="A cython wrapping of the C++ Cap'n Proto library",
     long_description=long_description,
-    long_description_content_type = 'text/x-rst',
+    long_description_content_type = 'text/markdown',
     license='BSD',
     author="Jacob Alexander", # <- Current maintainer; Original author -> Jason Paryani (setup.py only supports 1 author...)
     author_email="haata@kiibohd.com",