diff --git a/MANIFEST.in b/MANIFEST.in index e1a62886c438468fd5339c2d54687831b654f5be..9361e9d2b5e4ed876ffb8047835898926e6e4475 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,4 @@ include Makefile include src/*.c -include include/*.h \ No newline at end of file +include include/*.h +include README.md diff --git a/README.md b/README.md index ab8deb6735ef25ed6a4111f20f73378657395c53..ef75d4e7e9a5864c6163fdc2e2974ad93b1ef5c5 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Python module for binary_c - +Coverage:  Based on a original work by Jeff Andrews (can be found in old_solution/ directory) updated and extended for Python3 by Robert Izzard, David hendriks diff --git a/coverage.svg b/coverage.svg new file mode 100644 index 0000000000000000000000000000000000000000..e3a194825898162c01c3ad48af8208fd626e36a5 --- /dev/null +++ b/coverage.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg xmlns="http://www.w3.org/2000/svg" width="99" height="20"> + <linearGradient id="b" x2="0" y2="100%"> + <stop offset="0" stop-color="#bbb" stop-opacity=".1"/> + <stop offset="1" stop-opacity=".1"/> + </linearGradient> + <mask id="a"> + <rect width="99" height="20" rx="3" fill="#fff"/> + </mask> + <g mask="url(#a)"> + <path fill="#555" d="M0 0h63v20H0z"/> + <path fill="#e05d44" d="M63 0h36v20H63z"/> + <path fill="url(#b)" d="M0 0h99v20H0z"/> + </g> + <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"> + <text x="31.5" y="15" fill="#010101" fill-opacity=".3">coverage</text> + <text x="31.5" y="14">coverage</text> + <text x="80" y="15" fill="#010101" fill-opacity=".3">5%</text> + <text x="80" y="14">5%</text> + </g> +</svg> diff --git a/setup.py b/setup.py index 9957483e073c5d622b0bdf689d5f80be9abd996c..a6d51ec09346596ac3c92cf0023c8e0e8c8c9461 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,6 @@ def check_version(installed_binary_c_version, required_binary_c_versions): ) assert installed_binary_c_version in required_binary_c_versions, message - def execute_make(): """ Function to execute the makefile. @@ -155,10 +154,9 @@ INCLUDE_DIRS = ( "include", ] + BINARY_C_INCDIRS - + [os.path.join(GSL_DIR, "include")] - if GSL_DIR - else [] ) +if GSL_DIR: + INCLUDE_DIRS += [os.path.join(GSL_DIR, "include")] # LIBRARIES = ["binary_c"] + BINARY_C_LIBS + ["binary_c_python_api"] LIBRARIES = ["binary_c"] + BINARY_C_LIBS @@ -230,7 +228,7 @@ class CustomBuildCommand(distutils.command.build.build): setup( name="binarycpython", - version="0.2.4", + version="0.2.6", 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.""".format( ",".join(REQUIRED_BINARY_C_VERSIONS), ",".join(REQUIRED_BINARY_C_VERSIONS), @@ -254,7 +252,7 @@ setup( "binarycpython.core", "binarycpython.tests", ], - install_requires=["numpy", "pytest", "h5py", "pathos", "pandas", "astropy"], + install_requires=["numpy", "pytest", "h5py", "pathos", "pandas", "astropy", "matplotlib"], include_package_data=True, ext_modules=[BINARY_C_PYTHON_API_MODULE], # binary_c must be loaded classifiers=[