Accepting request 624537 from devel:languages:python
- Enable tests, skip upstream failing one - Fix failure of virtualenv --always-copy (bsc#1102096): * pypa-virtualenv-1189.patch OBS-URL: https://build.opensuse.org/request/show/624537 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-virtualenv?expand=0&rev=32
This commit is contained in:
commit
7fdd5e7346
26
pypa-virtualenv-1189.patch
Normal file
26
pypa-virtualenv-1189.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From 786675a83f494202cb9522d57a98e5ddc0d7405e Mon Sep 17 00:00:00 2001
|
||||
From: Ashley Whetter <asw@dneg.com>
|
||||
Date: Tue, 3 Jul 2018 10:48:19 -0700
|
||||
Subject: [PATCH] Fixed failure to copy on platforms that use lib64
|
||||
|
||||
The current behaviour attempts to copy a "lib" folder from the current directory,
|
||||
instead of copying the "lib" folder inside the virtualenv. Therefore the copying would fail.
|
||||
This fixes that by always copying the "lib" folder from the virtualenv.
|
||||
|
||||
---
|
||||
virtualenv.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/virtualenv.py b/virtualenv.py
|
||||
index c008a395..34c2f6a1 100755
|
||||
--- a/virtualenv.py
|
||||
+++ b/virtualenv.py
|
||||
@@ -1559,7 +1559,7 @@ def fix_lib64(lib_dir, symlink=True):
|
||||
if symlink:
|
||||
os.symlink('lib', lib64_link)
|
||||
else:
|
||||
- copyfile('lib', lib64_link)
|
||||
+ copyfile(lib_dir, lib64_link)
|
||||
|
||||
def resolve_interpreter(exe):
|
||||
"""
|
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 22 10:26:27 UTC 2018 - tchvatal@suse.com
|
||||
|
||||
- Enable tests, skip upstream failing one
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 20 16:29:52 UTC 2018 - mwilck@suse.com
|
||||
|
||||
- Fix failure of virtualenv --always-copy (bsc#1102096):
|
||||
* pypa-virtualenv-1189.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 21 08:13:12 UTC 2018 - tbechtold@suse.com
|
||||
|
||||
|
@ -20,20 +20,20 @@
|
||||
Name: python-virtualenv
|
||||
Version: 15.1.0
|
||||
Release: 0
|
||||
Url: http://www.virtualenv.org/
|
||||
Summary: Virtual Python Environment builder
|
||||
License: MIT
|
||||
Group: Development/Languages/Python
|
||||
Source: https://pypi.io/packages/source/v/virtualenv/virtualenv-%{version}.tar.gz
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: %{python_module devel}
|
||||
URL: http://www.virtualenv.org/
|
||||
Source: https://files.pythonhosted.org/packages/source/v/virtualenv/virtualenv-%{version}.tar.gz
|
||||
Patch01: pypa-virtualenv-1189.patch
|
||||
BuildRequires: %{python_module mock}
|
||||
BuildRequires: %{python_module pytest}
|
||||
BuildRequires: %{python_module setuptools}
|
||||
BuildRequires: python-rpm-macros
|
||||
Requires: python
|
||||
Requires(post): update-alternatives
|
||||
Requires(postun): update-alternatives
|
||||
BuildArch: noarch
|
||||
|
||||
%python_subpackages
|
||||
|
||||
%description
|
||||
@ -42,7 +42,7 @@ The basic problem being addressed is one of dependencies and versions, and
|
||||
indirectly permissions. Imagine you have an application that needs version 1
|
||||
of LibFoo, but another application requires version 2. How can you use both
|
||||
these applications? If you install everything into
|
||||
/usr/lib/python2.4/site-packages (or whatever your platforms standard location
|
||||
%{_libexecdir}/python2.4/site-packages (or whatever your platforms standard location
|
||||
is), its easy to end up in a situation where you unintentionally upgrade an
|
||||
application that shouldnt be upgraded.
|
||||
|
||||
@ -60,6 +60,7 @@ libraries either).
|
||||
|
||||
%prep
|
||||
%setup -q -n virtualenv-%{version}
|
||||
%patch01 -p1
|
||||
|
||||
%build
|
||||
%python_build
|
||||
@ -68,15 +69,19 @@ libraries either).
|
||||
%python_install
|
||||
%python_clone -a %{buildroot}%{_bindir}/virtualenv
|
||||
|
||||
%check
|
||||
# test broken upstream https://github.com/pypa/virtualenv/issues/530
|
||||
%python_expand py.test-%{$python_bin_suffix} -k 'not test_always_copy_option' -vv
|
||||
|
||||
%post
|
||||
%python_install_alternative virtualenv
|
||||
|
||||
%postun
|
||||
%python_uninstall_alternative virtualenv
|
||||
|
||||
%files %python_files
|
||||
%defattr(-,root,root,-)
|
||||
%doc LICENSE.txt README.rst
|
||||
%files %{python_files}
|
||||
%license LICENSE.txt
|
||||
%doc README.rst
|
||||
%{python_sitelib}/virtualenv*
|
||||
%python_alternative %{_bindir}/virtualenv
|
||||
%pycache_only %{python_sitelib}/__pycache__
|
||||
|
Loading…
Reference in New Issue
Block a user