Update for Manylinux2014

Author: Kijewski

Makefile

@@ -18,7 +18,9 @@ TIDY_CFLAGS += -std=c11 -D_ISOC11_SOURCE -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE
 
 export CC
 export CXX
-export RANLIB ?= ranlib
+
+export AR = gcc-ar
+export RANLIB = gcc-ranlib
 
 
 tidy-html5/.git:
@@ -33,8 +35,10 @@ tidy-html5/build/cmake/libtidys.a: | tidy-html5/.git
 			-DCMAKE_BUILD_TYPE=Release \
 			-DBUILD_SHARED_LIBS=OFF \
 			-DCMAKE_C_FLAGS="${TIDY_CFLAGS}" \
-			-DCMAKE_C_COMPILER="${CC}"
-			-DCMAKE_CXX_COMPILER="${CXX}"
+			-DCMAKE_C_COMPILER="`/usr/bin/which "${CC}"`" \
+			-DCMAKE_CXX_COMPILER="`/usr/bin/which "${CXX}"`" \
+			-DCMAKE_AR="`/usr/bin/which "$${AR}"`" \
+			-DCMAKE_RANLIB="`/usr/bin/which "$${RANLIB}"`"
 
 	cd tidy-html5/build/cmake/ && \
 		$(MAKE) VERBOSE=1 -B

generate_imports.py

@@ -11,11 +11,11 @@
 
 root = abspath(dirname(__file__))
 
-Config.set_library_file(sorted(
+Config.set_library_file((sorted(
     glob('/usr/lib/llvm-*/lib/libclang.so.1'),
     key=lambda p: float(match(r'/usr/lib/llvm-(\d+(?:[.]\d+)?)/', p).group(1)),
     reverse=True,
-)[0])
+) or ('/usr/lib64/llvm/libclang.so',))[0])
 
 index = Index.create()
 tu = index.parse(join(root, 'generate_imports_transclusion.h'))
@@ -121,7 +121,7 @@
                 continue
 
             if iskeyword(pretty_name):
-                pretty_name = f'{pretty_name}_'
+                pretty_name = pretty_name + '_'
 
             print("    ", repr(pretty_name), ": <", definition['type'], "> ", valuename, ",", file=f, sep='')
 

lib/DESCRIPTION

@@ -2,4 +2,5 @@
 PyTidyHtml5\n\
 -----------\n\
 \n\
+HTML clean-up and repair: Statically linked Python interface for `tidy-html5 <https://github.com/htacg/tidy-html5>`_.\
 """

lib/VERSION

@@ -1 +1 @@
-"0.0.5"
+"2020.7.17"

setup.py

@@ -10,7 +10,6 @@ def get_text(name):
         return eval(f.read().strip())
 
 
-
 extra_compile_args = [
     '-std=c++11', '-flto',
     '-O2', '-fomit-frame-pointer', '-fPIC', '-ggdb1', '-pipe',
@@ -31,13 +30,13 @@ def get_text(name):
     name=name,
     version=get_text('VERSION'),
     long_description=get_text('DESCRIPTION'),
-    description='TODO',
+    description='HTML clean-up and repair: Statically linked Python interface for tidy-html5.',
     author='René Kijewski',
     author_email='pypi.org@k6i.de',
     maintainer='René Kijewski',
     maintainer_email='pypi.org@k6i.de',
     url='https://github.com/Kijewski/pyjson5',
-    python_requires='~= 3.4',
+    python_requires='~= 3.6',
     zip_safe=False,
     ext_modules=[Extension(
         '_' + name,
@@ -49,7 +48,21 @@ def get_text(name):
     )],
     packages=[name],
     platforms=['any'],
-    license='Apache 2.0',
+    license='ISC',
     classifiers=[
+        'Development Status :: 4 - Beta',
+        'Intended Audience :: Developers',
+        'Intended Audience :: System Administrators',
+        'License :: OSI Approved :: ISC License (ISCL)',
+        'Operating System :: OS Independent',
+        'Programming Language :: Cython',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3 :: Only',
+        'Programming Language :: Python :: Implementation :: CPython',
+        'Topic :: Text Processing :: Markup :: HTML ',
     ],
 )