Cleanup

Author: donn

.gitignore

@@ -2,7 +2,7 @@
 
 # patched
 libparse.h
-libparse.cc
+libparse.cpp
 
 # swig
 libparse.py
@@ -11,6 +11,7 @@ libparse_wrap.*
 # python
 __pycache__
 /venv
+/dist
 *.egg-info
 
 # binaries

Makefile

@@ -10,6 +10,7 @@ CXXFLAGS += -g -std=c++17 -I$(shell python3 -c "import sysconfig; print(sysconfi
 
 
 all: _libparse.so
+patch: $(SRC_DIR)/libparse.cpp $(SRC_DIR)/libparse.h
 swig_out: $(SWIG_OUT)
 
 _libparse.so: $(OBJECTS)
@@ -39,4 +40,5 @@ clean:
 	rm -f $(SRC_DIR)/*.cpp $(SRC_DIR)/*.o $(SRC_DIR)/libparse.py $(SRC_DIR)/libparse.h  
 	rm -f *.so *.o *.dylib *.dll
 	rm -rf build/
-	rm -rf libparse.egg-info/
+	rm -rf libparse.egg-info/
+	rm -rf dist/

Readme.md

@@ -4,8 +4,8 @@ A SWIG-based Python wrapper around [Yosys](https://github.com/yosyshq/yosys)'s
 `libparse`, for all your lib file parsing needs.
 
 # Requirements
-* Python 3.2+
-* A C++17 compiler
+* Python 3.6+
+* A C++11 compiler
 * GNU Make
 
 # License
@@ -33,25 +33,25 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 `stdio_filebuf` from [Android Frameworks](https://android.googlesource.com/platform/frameworks/native/+/refs/heads/main/services/vr/performanced) used under the following conditions:
 
 ```
-// Copyright (c) 2009-2014 by the contributors listed in CREDITS.TXT
-// Copyright (c) 2016 Google, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+Copyright (c) 2009-2014 by the contributors listed in CREDITS.TXT
+Copyright (c) 2016 Google, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
 ```
-> The `CREDITS.TXT` in question could not be located at press time.
+> The `CREDITS.TXT` in question could not be located.

libparse/libparse.i

@@ -6,6 +6,7 @@
 
 %{
 #define SWIG_FILE_WITH_INIT
+#define Py_LIMITED_API 0x030600F0
 #include <iostream>
 #include <memory>
 #include "libparse.h"

libparse/py_iostream.h

@@ -1,3 +1,4 @@
+#define Py_LIMITED_API 0x030600F0
 #include "Python.h"
 #include <cstdio>
 #include <iostream>

setup.py

@@ -2,36 +2,25 @@
 import os
 import subprocess
 from setuptools import setup, find_packages, Extension
-from setuptools.command.build_py import build_py
 
 module_name = "libparse"
-__dir__ = os.path.dirname(__file__)
+__dir__ = os.path.dirname(os.path.abspath(__file__))
+
+subprocess.check_call(["make", "patch"], cwd=__dir__)
 
 ext = Extension(
-    name='_libparse',
-    swig_opts=['-c++'],
+    name="_libparse",
+    swig_opts=["-c++"],
     sources=[
-        'libparse/libparse.cpp',
-        'libparse/libparse.i',
+        "libparse/libparse.cpp",
+        "libparse/libparse.i",
     ],
     include_dirs=[
-        'libparse',
+        "libparse",
     ],
-    extra_compile_args=[
-        '-std=c++17',
-        "-DFILTERLIB"
-    ]
+    extra_compile_args=["-std=c++17", "-DFILTERLIB"],
 )
 
-class BuildPy(build_py):
-    def run(self):
-        subprocess.check_call([
-            "make",
-            "swig_out"
-        ])
-        self.run_command('build_ext')
-        super(build_py, self).run()
-
 setup(
     name=module_name,
     packages=find_packages(),
@@ -41,7 +30,7 @@ def run(self):
     long_description_content_type="text/markdown",
     author="Efabless Corporation and Contributors",
     author_email="[email protected]",
-    install_requires=[],
+    install_requires=["wheel"],
     classifiers=[
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python :: 3",
@@ -51,7 +40,4 @@ def run(self):
     ],
     python_requires=">3.6",
     ext_modules=[ext],
-    cmdclass={
-        'build_py': BuildPy,
-    },
-)
+)

test/test.py

@@ -25,4 +25,4 @@
         exit(-1)
     default_operating_conditions = operating_conditions_raw.values()[0]
 
-print(default_operating_conditions.id, default_operating_conditions.value)
+print(default_operating_conditions.id, default_operating_conditions.value)