V6.1.2 (#153)

* add setuptools dependency

* remove pip install workarounds

* Update CHANGELOG.rst

* v6.1.2

* Update Makefile

* Update build.py

CHANGELOG.rst

@@ -12,6 +12,11 @@ Future TODOs:
     * parameterised tests
 
 
+6.1.2 (2022-09-13)
+------------------
+
+* bugfix potentially broken pip install due to a mismatch in ``cffi`` versions (GitHub issue #151)
+
 
 6.1.1 (2022-08-18)
 ------------------

Makefile

@@ -1,5 +1,3 @@
-include .env
-
 # https://stackoverflow.com/questions/38878088/activate-anaconda-python-environment-from-makefile
 # By default make uses sh to execute commands, and sh doesn't know `source`
 SHELL=/bin/bash

build.py

@@ -7,18 +7,6 @@
 """
 import pathlib
 import re
-import subprocess
-
-# workaround to install build dependencies:
-try:
-    import setuptools
-except ImportError:
-    subprocess.run(["poetry", "run", "pip", "install", "setuptools"])
-
-try:
-    import cffi
-except ImportError:
-    subprocess.run(["poetry", "run", "pip", "install", "cffi"])
 
 import setuptools
 from cffi import FFI
@@ -33,29 +21,22 @@
 c_file_path = EXTENSION_PATH / C_FILE_NAME
 
 ffibuilder = FFI()
+ffibuilder.set_source(
+    EXTENSION_NAME,  # name of the output C extension
+    f'#include "{h_file_path}"',
+    sources=[str(c_file_path)],
+)
 
 with open(h_file_path) as h_file:
     # cffi does not like our preprocessor directives, so we remove them
     lns = h_file.read().splitlines()
     flt = filter(lambda ln: not re.match(r" *#", ln), lns)
 
 ffibuilder.cdef("\n".join(flt))
-
 with open(c_file_path) as c_file:
     # cffi does not like our preprocessor directives, so we remove them
     c_file_content = c_file.read()
 
-# ffibuilder.set_source(
-#     EXTENSION_NAME,  # name of the output C extension
-#     c_file_content
-# )
-
-ffibuilder.set_source(
-    EXTENSION_NAME,  # name of the output C extension
-    f'#include "{h_file_path}"',
-    sources=[str(c_file_path)],
-)
-
 if __name__ == "__main__":
     # not required
     # ffibuilder.compile(verbose=True)