diff --git a/include/binary_c_python.h b/include/binary_c_python.h index 30fcf79ce905d1073daaf3a1cd8d67c384adbadf..c242d96e5ff7745beb16c0c403472ec47ce29d30 100644 --- a/include/binary_c_python.h +++ b/include/binary_c_python.h @@ -7,8 +7,6 @@ */ #include "binary_c_API.h" -// #include "binary_c.h" -// #include "binary_c_API_prototypes.h" /* Binary_c's python API prototypes */ int run_system(char * argstring, diff --git a/setup.py b/setup.py index 4698408ebf33b73dbffc6e73c313d9b1c75f0dcb..1e9bf83a62b532d554f1fad22523692ed32e3d20 100644 --- a/setup.py +++ b/setup.py @@ -24,13 +24,13 @@ def license(): def check_version(installed_binary_c_version, required_binary_c_version): """Function to check the installed version and compare it to the required version""" message = """ - The binary_c version that is installed ({}) does not match the binary_c version ({}) + The binary_c version that is installed ({}) does not match any of the binary_c versions ({}) that this release of the binary_c python module requires. """.format(installed_binary_c_version, required_binary_c_version) - assert installed_binary_c_version == required_binary_c_version, message + assert installed_binary_c_version in required_binary_c_version, message ### -REQUIRED_BINARY_C_VERSION = '2.1.7' +REQUIRED_BINARY_C_VERSIONS = ['2.1.7'] #### GSL_DIR = os.getenv("GSL_DIR", None) @@ -61,7 +61,7 @@ BINARY_C_VERSION = ( .stdout.decode("utf-8") .split() ) -check_version(BINARY_C_VERSION[0], REQUIRED_BINARY_C_VERSION) +check_version(BINARY_C_VERSION[0], REQUIRED_BINARY_C_VERSIONS) BINARY_C_INCDIRS = ( subprocess.run(