diff --git a/.gitignore b/.gitignore index 01bbdec15361e059fe5f09ff34d7811ab440355f..4462aabb77dc5312d6ab4c2dc57915b6e3151991 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ output/* *.nfs* *.swp .python-version +\#* __pycache__/ .ipynb_checkpoints/ diff --git a/include/binary_c_python.h b/include/binary_c_python.h index f539ca9f336637b84b5a68473f7aa5e4d9cd3f64..7568bfcfe592db3d9cbc1efdac8a941400bed878 100644 --- a/include/binary_c_python.h +++ b/include/binary_c_python.h @@ -5,17 +5,16 @@ /* * Include binary_C's API */ - -#include "binary_c_API.h" #include "binary_c.h" -#include "binary_c_API_prototypes.h" +//#include "binary_c_API.h" +//#include "binary_c_API_prototypes.h" /* Binary_c's python API prototypes */ int run_system(char * argstring, long int custom_logging_func_memaddr, long int store_memaddr, long int persistent_data_memaddr, - int write_logfile, + int write_logfile, int population, char ** const buffer, char ** const error_buffer, @@ -26,7 +25,7 @@ int run_system(char * argstring, /* =================================================================== */ int return_arglines(char ** const outstring, - char ** const errorstring, + char ** const errorstring, size_t * const nbytes); int return_help_info(char * argstring, diff --git a/setup.py b/setup.py index 6d1e39302208f78c9ae82afeece6741603526730..188756bcd0e31660eba34e85c43219fa1f437cfa 100644 --- a/setup.py +++ b/setup.py @@ -26,8 +26,8 @@ def license(): def check_version(installed_binary_c_version, required_binary_c_versions): """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 versions ({}) - that this release of the binary_c python module requires. + The binary_c version that is installed ({}) does not match the binary_c versions ({}) + that this release of the binary_c python module requires. """.format( installed_binary_c_version, required_binary_c_versions ) @@ -115,7 +115,6 @@ for x in DEFINES: # add API header file API_h = os.path.join(BINARY_C_DIR, "src", "API", "binary_c_API.h") -BINARY_C_DEFINE_MACROS.extend([("BINARY_C_API_H", API_h)]) ############################################################ # Setting all directories and LIBRARIES to their final values @@ -188,9 +187,9 @@ setup( version="0.2", description=""" This is a python API for binary_c (versions {}) by David Hendriks, Rob Izzard and collaborators. - Based on the initial set up by Jeff andrews. + Based on the initial set up by Jeff andrews. It is tested and designed to work for versions {}, we can't guarantee proper functioning for other versions - + If you want to use a different version of binary_c, download and install a different version of this package """.format( str(REQUIRED_BINARY_C_VERSIONS), str(REQUIRED_BINARY_C_VERSIONS)