package init
This commit is contained in:
gu-gu-gu
parent
8d73e9c1df
commit
022eaffa42
39
91.patch
Normal file
39
91.patch
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
From 6bfb0f17a033c485948e09e6c18bc08f5948830c Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
|
||||||
|
Date: Thu, 23 Aug 2018 21:19:50 +0200
|
||||||
|
Subject: [PATCH] Instead of using the virtualenv command, use -m virtualenv
|
||||||
|
|
||||||
|
Fixes https://github.com/manahl/pytest-plugins/issues/79
|
||||||
|
---
|
||||||
|
pytest-virtualenv/pytest_virtualenv.py | 11 +++++++----
|
||||||
|
1 file changed, 7 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/pytest-virtualenv/pytest_virtualenv.py b/pytest-virtualenv/pytest_virtualenv.py
|
||||||
|
index a7981b3..e54039c 100644
|
||||||
|
--- a/pytest-virtualenv/pytest_virtualenv.py
|
||||||
|
+++ b/pytest-virtualenv/pytest_virtualenv.py
|
||||||
|
@@ -20,7 +20,8 @@ class FixtureConfig(Config):
|
||||||
|
__slots__ = ('virtualenv_executable')
|
||||||
|
|
||||||
|
# Default values for system resource locations - patch this to change defaults
|
||||||
|
-DEFAULT_VIRTUALENV_FIXTURE_EXECUTABLE = (cmdline.which('virtualenv') + ['virtualenv'])[0]
|
||||||
|
+# Can be a string or list of them
|
||||||
|
+DEFAULT_VIRTUALENV_FIXTURE_EXECUTABLE = [sys.executable, '-m', 'virtualenv']
|
||||||
|
|
||||||
|
CONFIG = FixtureConfig(
|
||||||
|
virtualenv_executable=os.getenv('VIRTUALENV_FIXTURE_EXECUTABLE', DEFAULT_VIRTUALENV_FIXTURE_EXECUTABLE),
|
||||||
|
@@ -132,9 +133,11 @@ def __init__(self, env=None, workspace=None, name='.env', python=None, args=None
|
||||||
|
del(self.env['PYTHONPATH'])
|
||||||
|
|
||||||
|
self.virtualenv_cmd = CONFIG.virtualenv_executable
|
||||||
|
- cmd = [self.virtualenv_cmd,
|
||||||
|
- '-p', python or cmdline.get_real_python_executable()
|
||||||
|
- ]
|
||||||
|
+ if isinstance(self.virtualenv_cmd, str):
|
||||||
|
+ cmd = [self.virtualenv_cmd]
|
||||||
|
+ else:
|
||||||
|
+ cmd = list(self.virtualenv_cmd)
|
||||||
|
+ cmd.extend(['-p', python or cmdline.get_real_python_executable()])
|
||||||
|
cmd.extend(self.args)
|
||||||
|
cmd.append(str(self.virtualenv))
|
||||||
|
self.run(cmd)
|
||||||
BIN
pytest-virtualenv-1.2.11.tar.gz
Normal file
BIN
pytest-virtualenv-1.2.11.tar.gz
Normal file
Binary file not shown.
71
python-pytest-virtualenv.spec
Normal file
71
python-pytest-virtualenv.spec
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
%global with_tests 0%{?_with_tests:1}
|
||||||
|
Name: python-pytest-virtualenv
|
||||||
|
Version: 1.2.11
|
||||||
|
Release: 10
|
||||||
|
Summary: Virtualenv fixture for py.test
|
||||||
|
License: MIT
|
||||||
|
URL: https://pypi.python.org/pypi/pytest-virtualenv
|
||||||
|
Source0: https://files.pythonhosted.org/packages/source/p/pytest-virtualenv/pytest-virtualenv-1.2.11.tar.gz
|
||||||
|
BuildArch: noarch
|
||||||
|
BuildRequires: python2-devel python3-devel python2-pytest python3-pytest
|
||||||
|
BuildRequires: python2-six python3-six python2-setuptools_git python3-setuptools_git
|
||||||
|
%if %{with_tests}
|
||||||
|
BuildRequires: python2-pytest-shutil python3-pytest-shutil
|
||||||
|
BuildRequires: python2-pytest-fixture-config python3-pytest-fixture-config python2-path python3-path
|
||||||
|
BuildRequires: python2-execnet python3-execnet python2-mock python3-mock python2-contextlib2
|
||||||
|
BuildRequires: python3-contextlib2 python2-virtualenv python3-virtualenv
|
||||||
|
%endif
|
||||||
|
Patch0: https://github.com/manahl/pytest-plugins/pull/91.patch
|
||||||
|
|
||||||
|
%description
|
||||||
|
Create a Python virtual environment in your test that cleans up on teardown.
|
||||||
|
The fixture has utility methods to install packages and list what's installed.
|
||||||
|
|
||||||
|
%package -n python2-pytest-virtualenv
|
||||||
|
Summary: Virtualenv fixture for py.test
|
||||||
|
%python_provide python2-pytest-virtualenv
|
||||||
|
Requires: python2-pytest python2-pytest-shutil python2-pytest-fixture-config
|
||||||
|
Requires: python2-path python2-execnet python2-contextlib2 python2-virtualenv
|
||||||
|
|
||||||
|
%description -n python2-pytest-virtualenv
|
||||||
|
Create a Python virtual environment in your test that cleans up on teardown.
|
||||||
|
The fixture has utility methods to install packages and list what's installed.
|
||||||
|
|
||||||
|
%package -n python3-pytest-virtualenv
|
||||||
|
Summary: Virtualenv fixture for py.test
|
||||||
|
%python_provide python3-pytest-virtualenv
|
||||||
|
Requires: python3-pytest python3-pytest-shutil python3-pytest-fixture-config
|
||||||
|
Requires: python3-path python3-execnet python3-contextlib2 python3-virtualenv
|
||||||
|
|
||||||
|
%description -n python3-pytest-virtualenv
|
||||||
|
Create a Python virtual environment in your test that cleans up on teardown.
|
||||||
|
The fixture has utility methods to install packages and list what's installed.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%autosetup -n pytest-virtualenv-%{version} -p1
|
||||||
|
|
||||||
|
%build
|
||||||
|
%py2_build
|
||||||
|
%py3_build
|
||||||
|
|
||||||
|
%install
|
||||||
|
%py2_install
|
||||||
|
%py3_install
|
||||||
|
|
||||||
|
%if %{with_tests}
|
||||||
|
%check
|
||||||
|
%{__python2} setup.py test
|
||||||
|
%{__python3} setup.py test
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%files -n python2-pytest-virtualenv
|
||||||
|
%doc README.md CHANGES.md
|
||||||
|
%{python2_sitelib}/*
|
||||||
|
|
||||||
|
%files -n python3-pytest-virtualenv
|
||||||
|
%doc README.md CHANGES.md
|
||||||
|
%{python3_sitelib}/*
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Wed Jan 08 2020 gulining<gulining@huawei.com> - 1.2.11-10
|
||||||
|
- Pakcage init
|
||||||
Loading…
x
Reference in New Issue
Block a user