New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

install_lib should take precedence when reading distutils config. #1642

Merged
merged 2 commits into from Mar 13, 2014

Conversation

Projects
None yet
2 participants
@schlamar
Contributor

schlamar commented Mar 13, 2014

Fix for #1641

@qwcode

This comment has been minimized.

Show comment
Hide comment
@qwcode

qwcode Mar 13, 2014

Contributor

lgtm, although it looks a new failure popped up due to this. see travis build

Contributor

qwcode commented Mar 13, 2014

lgtm, although it looks a new failure popped up due to this. see travis build

@@ -179,6 +179,10 @@ def distutils_scheme(dist_name, user=False, home=None, root=None):
for key in SCHEME_KEYS:
scheme[key] = getattr(i, 'install_' + key)
if i.install_lib is not None:
# install_lib takes precedence over purelib and platlib
scheme.update(dict(purelib=i.install_lib, platlib=i.install_lib))

This comment has been minimized.

@qwcode

qwcode Mar 13, 2014

Contributor

an alternative here would be to push the handling of this down into the wheel code, i.e. the consumers of the scheme should be handling the override, not the scheme itself, but I guess this is ok.

@qwcode

qwcode Mar 13, 2014

Contributor

an alternative here would be to push the handling of this down into the wheel code, i.e. the consumers of the scheme should be handling the override, not the scheme itself, but I guess this is ok.

This comment has been minimized.

@schlamar

schlamar Mar 13, 2014

Contributor

This was my first thought, but install_lib is not present in the scheme at all...

@schlamar

schlamar Mar 13, 2014

Contributor

This was my first thought, but install_lib is not present in the scheme at all...

@schlamar

This comment has been minimized.

Show comment
Hide comment
@schlamar

schlamar Mar 13, 2014

Contributor

although it looks a new failure popped up due to this.

No, this is not due to my changes. os.path.abspath strips trailing slashes, so the comparison fails:

>>> os.path.abspath('/path/to/x/')
'/path/to/x'

However, I add a commit to fix this.

Contributor

schlamar commented Mar 13, 2014

although it looks a new failure popped up due to this.

No, this is not due to my changes. os.path.abspath strips trailing slashes, so the comparison fails:

>>> os.path.abspath('/path/to/x/')
'/path/to/x'

However, I add a commit to fix this.

@qwcode

This comment has been minimized.

Show comment
Hide comment
@qwcode

qwcode Mar 13, 2014

Contributor

ok, looks good. will merge after a clean build finishes.

Contributor

qwcode commented Mar 13, 2014

ok, looks good. will merge after a clean build finishes.

qwcode added a commit that referenced this pull request Mar 13, 2014

Merge pull request #1642 from schlamar/handle_install_lib
install_lib should take precedence when reading distutils config.

@qwcode qwcode merged commit 200cad4 into pypa:develop Mar 13, 2014

1 check was pending

default The Travis CI build is in progress
Details

@schlamar schlamar deleted the schlamar:handle_install_lib branch Mar 13, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment