Skip to content
This repository was archived by the owner on Jan 7, 2023. It is now read-only.

Conversation

ndawe
Copy link
Member

@ndawe ndawe commented Nov 16, 2012

I have a few other things I would like to port from rootpy.root2array to root_numpy. Then we can remove the duplication of root_numpy inside rootpy. I'll send a separate PR soon.

@piti118
Copy link
Contributor

piti118 commented Nov 16, 2012

Does it break setup.py build_ext --inplace?

@piti118
Copy link
Contributor

piti118 commented Nov 16, 2012

you will need to edit genc file too

@ndawe
Copy link
Member Author

ndawe commented Nov 16, 2012

inplace still works. I updated the setup. Will fix genc. Maybe this genc command to rerun cython can go in the Makefile?

@piti118
Copy link
Contributor

piti118 commented Nov 16, 2012

That'd be good.

Does inplace put the _libroot_numpy.so in root_numpy or src?

On Nov 16, 2012, at 10:33 AM, Noel Dawe wrote:

inplace still works. I updated the setup. Will fix genc. Maybe this genc command to rerun cython can go in the Makefile?


Reply to this email directly or view it on GitHub.

@ndawe
Copy link
Member Author

ndawe commented Nov 16, 2012

root_numpy. All tests pass. I run "make" before committing which runs all the nosetests.

@ndawe
Copy link
Member Author

ndawe commented Nov 18, 2012

Hi Piti, do you think this PR is ok to merge in?

@ndawe
Copy link
Member Author

ndawe commented Nov 18, 2012

nm, I need to rebase on master, will do now.

@piti118
Copy link
Contributor

piti118 commented Nov 19, 2012

Hmm... I'm not really sure if I like moving the pyx and all C/C++ files to src though. If it's what most people do, then I'm fine with it.

I mean this is a small enough module it has like 8 files or something. Having all relevant source in one directory makes it easy to find what happen when things break. But, again, I'm fine either way.

@ndawe
Copy link
Member Author

ndawe commented Nov 19, 2012

Yeah, it's not totally necessary. I've just contributed to other projects where the files used to compile extension modules were separated out into src directories, just to avoid clutter.

@cdeil
Copy link
Contributor

cdeil commented Nov 30, 2012

@ndawe Can you trigger a travis build? I think you need to rebase on master anyways?

@ndawe
Copy link
Member Author

ndawe commented Nov 30, 2012

rebased

@ndawe
Copy link
Member Author

ndawe commented Dec 9, 2012

Hold off on merging this for now. I need to fix some merging mistakes in my rebase.

@ndawe
Copy link
Member Author

ndawe commented Dec 9, 2012

This is ready to be merged in.

pwaller added a commit that referenced this pull request Dec 9, 2012
MRG: Small changes and move C++/Cython source to root_numpy/src directory
@pwaller pwaller merged commit 8216b46 into scikit-hep:master Dec 9, 2012
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants