Skip to content

Commit

Permalink
Merge pull request #24 from dpryan79/small_fixes
Browse files Browse the repository at this point in the history
Try to fix the OSX build
  • Loading branch information
dpryan79 authored Nov 23, 2016
2 parents 6ece52c + 428986f commit 1cddce7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions pyBigWig.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "pyBigWig.h"

#ifdef WITHNUMPY
#include <values.h>
#include <float.h>
#include "numpy/npy_common.h"
#include "numpy/halffloat.h"
#include "numpy/ndarrayobject.h"
Expand Down Expand Up @@ -404,7 +404,7 @@ static PyObject *pyBwGetValues(pyBigWigFile_t *self, PyObject *args) {
npy_intp len = end - start;
ret = PyArray_SimpleNewFromData(1, &len, NPY_FLOAT, (void *) o->value);
//This will break if numpy ever stops using malloc!
PyArray_ENABLEFLAGS(ret, NPY_ARRAY_OWNDATA);
PyArray_ENABLEFLAGS((PyArrayObject*) ret, NPY_ARRAY_OWNDATA);
free(o->start);
free(o->end);
free(o);
Expand Down Expand Up @@ -1429,7 +1429,7 @@ PyObject *pyBwAddEntries(pyBigWigFile_t *self, PyObject *args, PyObject *kwds) {

static PyObject *pyBBGetEntries(pyBigWigFile_t *self, PyObject *args, PyObject *kwds) {
bigWigFile_t *bw = self->bw;
int i;
uint32_t i;
uint32_t start, end = -1, tid;
unsigned long startl, endl;
char *chrom;
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@
include_dirs = include_dirs)

setup(name = 'pyBigWig',
version = '0.3.0',
version = '0.3.1',
description = 'A package for accessing bigWig files using libBigWig',
author = "Devon P. Ryan",
author_email = "[email protected]",
url = "https://github.com/dpryan79/pyBigWig",
download_url = "https://github.com/dpryan79/pyBigWig/tarball/0.3.0",
download_url = "https://github.com/dpryan79/pyBigWig/tarball/0.3.1",
keywords = ["bioinformatics", "bigWig"],
classifier = ["Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
Expand Down

0 comments on commit 1cddce7

Please sign in to comment.