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

Update virtualenv.py #472

Merged
merged 1 commit into from Sep 21, 2015

Conversation

Projects
None yet
4 participants
@pmakowski
Contributor

pmakowski commented Sep 30, 2013

These lines about multiarch_exec are not valid for Mageia see for example this bug report : https://bugs.mageia.org/show_bug.cgi?id=11283

Update virtualenv.py
These lines about multiarch_exec are not valid for Mageia see for example this bug report : https://bugs.mageia.org/show_bug.cgi?id=11283
@pnasrat

This comment has been minimized.

Show comment
Hide comment
@pnasrat

pnasrat Oct 8, 2013

Contributor

Was the fix backported to Mageia 2, is this still relevant for Mandriva?

Contributor

pnasrat commented Oct 8, 2013

Was the fix backported to Mageia 2, is this still relevant for Mandriva?

@dbitouze

This comment has been minimized.

Show comment
Hide comment
@dbitouze

dbitouze Oct 8, 2013

Was the fix backported to Mageia 2,

That seems to not be relevant for Mageia 3.

is this still relevant for Mandriva?

I'm sorry, I've no idea. Maybe Philippe Makowski could answer this.

dbitouze commented Oct 8, 2013

Was the fix backported to Mageia 2,

That seems to not be relevant for Mageia 3.

is this still relevant for Mandriva?

I'm sorry, I've no idea. Maybe Philippe Makowski could answer this.

@pnasrat

This comment has been minimized.

Show comment
Hide comment
@pnasrat

pnasrat Oct 8, 2013

Contributor

It is relevant as if users are still on the platform we should still apply the workaround for them.

Contributor

pnasrat commented Oct 8, 2013

It is relevant as if users are still on the platform we should still apply the workaround for them.

@pmakowski

This comment has been minimized.

Show comment
Hide comment
@pmakowski

pmakowski Oct 8, 2013

Contributor

the only thing I can say is that These lines about multiarch_exec are not valid for all actives Mageia releases (2,3 and coming 4) I can't speak for Mandriva
may be you can add a test on the distro name ?

Contributor

pmakowski commented Oct 8, 2013

the only thing I can say is that These lines about multiarch_exec are not valid for all actives Mageia releases (2,3 and coming 4) I can't speak for Mandriva
may be you can add a test on the distro name ?

@pmakowski

This comment has been minimized.

Show comment
Hide comment
@pmakowski

pmakowski Oct 21, 2013

Contributor

Any news ?
please merge or change your condition

Contributor

pmakowski commented Oct 21, 2013

Any news ?
please merge or change your condition

@dbitouze

This comment has been minimized.

Show comment
Hide comment
@dbitouze

dbitouze Nov 12, 2014

The problem still occurs with virtualenv-1.11.4 shipped with Plone 4.3.3.

dbitouze commented Nov 12, 2014

The problem still occurs with virtualenv-1.11.4 shipped with Plone 4.3.3.

@pmakowski

This comment has been minimized.

Show comment
Hide comment
@pmakowski

pmakowski Nov 13, 2014

Contributor

We apply this patch http://svnweb.mageia.org/packages/cauldron/python-virtualenv/current/SOURCES/virtualenv-1.10.1-mga-fix_inc_dir.patch?view=markup in Mageia 3,4,5 (older Mageia are no longer maintained) and for what I see in OpenMandriva, they only provide virtualenv 1.8.2 !

Contributor

pmakowski commented Nov 13, 2014

We apply this patch http://svnweb.mageia.org/packages/cauldron/python-virtualenv/current/SOURCES/virtualenv-1.10.1-mga-fix_inc_dir.patch?view=markup in Mageia 3,4,5 (older Mageia are no longer maintained) and for what I see in OpenMandriva, they only provide virtualenv 1.8.2 !

@dbitouze

This comment has been minimized.

Show comment
Hide comment
@dbitouze

dbitouze Nov 13, 2014

In fact, this isn't related to Mandriva nor Mageia: virtualenv-1.11.4 shipped with Plone 4.3.3 still contains the lines:

multiarch_exec = '/usr/bin/multiarch-platform'
if is_executable_file(multiarch_exec):
    # In Mageia (2) and Mandriva distros the include dir must be like:
    # virtualenv/include/multiarch-x86_64-linux/python2.7
    # instead of being virtualenv/include/python2.7
    p = subprocess.Popen(multiarch_exec, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
    stdout, stderr = p.communicate()
    # stdout.strip is needed to remove newline character
    inc_dir = join(home_dir, 'include', stdout.strip(), py_version + abiflags)
else:
    inc_dir = join(home_dir, 'include', py_version + abiflags)

as you can see with the following commands:

wget https://launchpad.net/plone/4.3/4.3.3/+download/Plone-4.3.3-UnifiedInstaller.tgz
tar xfz Plone-4.3.3-UnifiedInstaller.tgz
cd Plone-4.3.3-UnifiedInstaller/packages/
tar xfz virtualenv-1.11.4.tar.gz
more virtualenv-1.11.4/virtualenv.py | grep --after-context=10 "if is_executable_file(multiarch_exec):"

dbitouze commented Nov 13, 2014

In fact, this isn't related to Mandriva nor Mageia: virtualenv-1.11.4 shipped with Plone 4.3.3 still contains the lines:

multiarch_exec = '/usr/bin/multiarch-platform'
if is_executable_file(multiarch_exec):
    # In Mageia (2) and Mandriva distros the include dir must be like:
    # virtualenv/include/multiarch-x86_64-linux/python2.7
    # instead of being virtualenv/include/python2.7
    p = subprocess.Popen(multiarch_exec, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
    stdout, stderr = p.communicate()
    # stdout.strip is needed to remove newline character
    inc_dir = join(home_dir, 'include', stdout.strip(), py_version + abiflags)
else:
    inc_dir = join(home_dir, 'include', py_version + abiflags)

as you can see with the following commands:

wget https://launchpad.net/plone/4.3/4.3.3/+download/Plone-4.3.3-UnifiedInstaller.tgz
tar xfz Plone-4.3.3-UnifiedInstaller.tgz
cd Plone-4.3.3-UnifiedInstaller/packages/
tar xfz virtualenv-1.11.4.tar.gz
more virtualenv-1.11.4/virtualenv.py | grep --after-context=10 "if is_executable_file(multiarch_exec):"
@pmakowski

This comment has been minimized.

Show comment
Hide comment

Ivoz added a commit that referenced this pull request Sep 21, 2015

Merge pull request #472 from pmakowski/patch-1
Remove mandriva/mageia multiarch workaround, no longer needed

@Ivoz Ivoz merged commit 47cda29 into pypa:develop Sep 21, 2015

1 check passed

default The Travis CI build passed
Details

Ivoz added a commit that referenced this pull request Sep 21, 2015

willingc added a commit to willingc/virtualenv that referenced this pull request Oct 10, 2015

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