fix: pypy incompatibility, windows 2019 dead

Author: donn

.github/workflows/ci.yml

@@ -1,3 +1,20 @@
+# Copyright (C) 2025 Mohamed Gaber
+#
+# Adapted from Yosys wheels
+#
+# Copyright (C) 2024 Efabless Corporation
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 name: Build Wheels for PyPI
 
 # Events that trigger workflow
@@ -33,8 +50,8 @@ jobs:
               archs: "x86_64,arm64",
             },
             {
-              name: "Windows Server 2019",
-              runner: "windows-2019",
+              name: "Windows Server 2022",
+              runner: "windows-2022",
               archs: "AMD64,ARM64",
             },
           ]
@@ -55,11 +72,8 @@ jobs:
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.21.1
         env:
-          # * APIs not supported by PyPy
-          # * Musllinux disabled because it increases build time from 48m to ~3h
           CIBW_ARCHS: ${{ matrix.os.archs }}
           CIBW_BUILD_VERBOSITY: "1"
-          # manylinux2014 (default) does not have a modern enough C++ compiler for Yosys
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
           CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28
       - uses: actions/upload-artifact@v4

libparse/wrapper.cpp

@@ -26,18 +26,16 @@ namespace py = pybind11;
 using namespace Yosys;
 
 struct PyIStream : public std::istream {
-	PyIStream(stdio_filebuf<char> *buffer) : std::istream(buffer), buffer_(buffer) {}
+	PyIStream(FILE *f) : std::istream(&buffer_), buffer_(f) {}
 
 	static PyIStream *make_from(const py::object &pyfile)
 	{
-		if (pyfile == py::none()) {
+		if (pyfile.is(py::none())) {
 			throw std::runtime_error("None is not a valid input stream");
 		}
-		if (!hasattr(pyfile, "fileno")) {
-			throw std::runtime_error("Passed object has no fileno() method");
-		}
 
-		auto fd = PyObject_AsFileDescriptor(pyfile.ptr());
+		auto fd_attr = pyfile.attr("fileno");
+        auto fd = fd_attr.cast<int>();
 		if (fd == -1) {
 			throw std::runtime_error("Failed to get file descriptor");
 		}
@@ -47,18 +45,11 @@ struct PyIStream : public std::istream {
 			throw std::runtime_error("Failed to open input stream");
 		}
 
-		return new PyIStream(new stdio_filebuf<char>(f));
-	}
-
-	~PyIStream()
-	{
-		if (buffer_) {
-			delete buffer_;
-		}
+		return new PyIStream(f);
 	}
 
-      private:
-	stdio_filebuf<char> *buffer_ = nullptr;
+    private:
+	stdio_filebuf<char> buffer_;
 };
 
 LibertyParser *from_file(const py::object &pyfile)