[incubator-mxnet] branch v1.8.x updated: backport #19037 (#19514) (#20074)

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

manuseth pushed a commit to branch v1.8.x
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git


The following commit(s) were added to refs/heads/v1.8.x by this push:
     new a192bca  backport #19037 (#19514) (#20074)
a192bca is described below

commit a192bcac1f02757c452a9cc947ea44bdd86c213b
Author: Rohit Kumar Srivastava <sr...@osu.edu>
AuthorDate: Mon Mar 22 13:30:12 2021 -0700

    backport #19037 (#19514) (#20074)
    
    Co-authored-by: Wei Chu <we...@amazon.com>
    
    Co-authored-by: waytrue17 <52...@users.noreply.github.com>
    Co-authored-by: Wei Chu <we...@amazon.com>
---
 tools/pip/setup.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tools/pip/setup.py b/tools/pip/setup.py
index 9f56e20..483d37f 100644
--- a/tools/pip/setup.py
+++ b/tools/pip/setup.py
@@ -127,11 +127,6 @@ with open('doc/PYPI_README.md') as readme_file:
 with open('doc/{0}_ADDITIONAL.md'.format(variant)) as variant_doc:
     long_description = long_description + skip_markdown_comments(variant_doc.read())
 
-# pypi only supports rst, so use pandoc to convert
-import pypandoc
-if platform.system() == 'Darwin':
-    pypandoc.download_pandoc()
-long_description = pypandoc.convert_text(long_description, 'rst', 'md')
 short_description = 'MXNet is an ultra-scalable deep learning framework.'
 libraries = []
 if variant == 'CPU':
@@ -169,7 +164,7 @@ if platform.system() == 'Linux':
         package_data['mxnet'].append('mxnet/libgfortran.so.4')
     if os.path.exists(os.path.join(libdir, 'libopenblas.so.0')):
         shutil.copy(os.path.join(libdir, 'libopenblas.so.0'), mxdir)
-        package_data['mxnet'].append('mxnet/libquadmath.so.0')
+        package_data['mxnet'].append('mxnet/libopenblas.so.0')
 
 # Copy licenses and notice
 for f in os.listdir('mxnet/licenses'):
@@ -184,6 +179,7 @@ _generate_op_module_signature('mxnet', 'ndarray', _generate_ndarray_function_cod
 setup(name=package_name,
       version=__version__,
       long_description=long_description,
+      long_description_content_type='text/markdown',
       description=short_description,
       zip_safe=False,
       packages=find_packages(),