A collection of fixes for when prefix != exec_prefix. #634
Conversation
| @@ -0,0 +1 @@ | |||
| tests | |||
There was a problem hiding this comment.
Uhhh, what is this file for?
Oh, symlink. I'd prefer if you just renamed the folder.
There was a problem hiding this comment.
Agrred. Don't use symlinks because they are not well supported on Windows. Also, this is unrelated to the rest of the patch. Please remove it and submit as a separate PR specifically stating that it's fixing setup.py test.
|
I'll pull out those test-related fixes today or tomorrow as a separate PR. |
|
The test-only pull request is here: #635. |
https://mail.python.org/pipermail/distutils-sig/2008-April/009336.html http://mail.python.org/pipermail/distutils-sig/attachments/20080414/16fb135e/attachment-0001.diff Add copy_inc_files function to fix issue of lost pyconfig.h. When sys.exec_prefix and sys.prefix differ the pyconfig.h file is in $(exec_prefix)/include/python$(version) and that file is missing in the virtualenv because env/include/python$(version) is a symlink to $(real_prefix)/include/python$(version). If --always-copy is used then the two include directories merge. I added copy_inc_files to symlink (or copy) the individual contents of prefix include and exec_prefix include into env/include.
|
The prefix-only pull request is here: #636. |
|
@shidesthewise Thanks. I've commented on the tests PR (I'm basically OK with the actual change, but not entirely sure about the directory renaming). The prefix-only one should be fine. I'm unavailable for a couple of weeks, though, so if no-one else progresses these in the meantime, ping me early September and I'll get back to them. |
command name "test" also as the directory name to find tests.
Skip copying required file if exec_prefix != prefix and the file is sourced from exec_prefix. Let the copying/linking of exec_dir in install_python handle these files.
|
I was wondering what the likelihood of these being adopted and merged into the mainline. |
|
Looking again at this:
I'm going to duck on this, I'm afraid - none of the changes affect systems or situations I have any experience with, and I'd rather one of the other developers who does have some familiarity with the subject take a look and comment. |
|
Because this is old and based on 1.11 and virtualenv is now in a 13.X series, I'll re-submit. |
Patch version from Hans Meine from the duistutils mail list.
https://mail.python.org/pipermail/distutils-sig/2008-April/009336.html
http://mail.python.org/pipermail/distutils-sig/attachments/20080414/16fb135e/attachment-0001.diff
Add copy_inc_files function to fix issue of lost pyconfig.h.
When sys.exec_prefix and sys.prefix differ the pyconfig.h file$(exec_prefix)/include/python$ (version) and that file is$(real_prefix)/include/python$ (version).
is in
missing in the virtualenv because env/include/python$(version)
is a symlink to
If --always-copy is used then the two include directories merge.
I added copy_inc_files to symlink (or copy) the individual contents
of prefix include and exec_prefix include into env/include.
Update expected output to match actual output.
Setuptools and pip install line has been on one line instead of two
for awhile.
Add link from test to tests so python setup.py test work as expected.