update version to 1.7.0

This commit is contained in:
Wangjunqi123 2022-11-28 17:08:33 +08:00
parent 371a09b8f9
commit b983bfcbc9
4 changed files with 72 additions and 65 deletions

View File

@ -1,39 +0,0 @@
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)

Binary file not shown.

Binary file not shown.

View File

@ -1,21 +1,14 @@
%global with_tests 0%{?_with_tests:1} %global _empty_manifest_terminate_build 0
%bcond_without tests
Name: python-pytest-virtualenv Name: python-pytest-virtualenv
Version: 1.2.11 Version: 1.7.0
Release: 12 Release: 1
Summary: Virtualenv fixture for py.test Summary: Virtualenv fixture for py.test
License: MIT License: MIT
URL: https://pypi.python.org/pypi/pytest-virtualenv URL: https://github.com/manahl/pytest-plugins
Source0: https://files.pythonhosted.org/packages/source/p/pytest-virtualenv/pytest-virtualenv-1.2.11.tar.gz Source0: https://files.pythonhosted.org/packages/96/73/f3d34462e1d2de89bab407ba3dac5212e9e6996f5b4bc3c6930c68f51b62/pytest-virtualenv-1.7.0.tar.gz
BuildArch: noarch BuildArch: noarch
BuildRequires: python3-devel python3-pytest
BuildRequires: python3-six python3-setuptools_git
%if %{with_tests}
BuildRequires: python3-pytest-shutil
BuildRequires: python3-pytest-fixture-config python3-path
BuildRequires: python3-execnet python3-mock
BuildRequires: python3-contextlib2 python3-virtualenv
%endif
Patch0: 91.patch
%description %description
Create a Python virtual environment in your test that cleans up on teardown. Create a Python virtual environment in your test that cleans up on teardown.
@ -23,14 +16,36 @@ The fixture has utility methods to install packages and list what's installed.
%package -n python3-pytest-virtualenv %package -n python3-pytest-virtualenv
Summary: Virtualenv fixture for py.test Summary: Virtualenv fixture for py.test
%python_provide python3-pytest-virtualenv Provides: python-pytest-virtualenv = %{version}-%{release}
Requires: python3-pytest python3-pytest-shutil python3-pytest-fixture-config BuildRequires: python3-devel
Requires: python3-path python3-execnet python3-contextlib2 python3-virtualenv BuildRequires: python3-pytest
BuildRequires: python3-six
BuildRequires: python3-setuptools_git
%if %{with tests}
BuildRequires: python3-pytest-shutil
BuildRequires: python3-pytest-fixture-config
BuildRequires: python3-path
BuildRequires: python3-execnet
BuildRequires: python3-mock
BuildRequires: python3-contextlib2
BuildRequires: python3-virtualenv
%endif
Requires: python3-pytest-fixture-config
Requires: python3-pytest-shutil
Requires: python3-pytest
Requires: python3-virtualenv
Requires: python3-mock
%description -n python3-pytest-virtualenv %description -n python3-pytest-virtualenv
Create a Python virtual environment in your test that cleans up on teardown. 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. The fixture has utility methods to install packages and list what's installed.
%package help
Summary: Development documents and examples for pytest-virtualenv
Provides: python3-pytest-virtualenv-doc
%description help
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 %prep
%autosetup -n pytest-virtualenv-%{version} %autosetup -n pytest-virtualenv-%{version}
@ -39,17 +54,48 @@ The fixture has utility methods to install packages and list what's installed.
%install %install
%py3_install %py3_install
install -d -m755 %{buildroot}/%{_pkgdocdir}
if [ -d doc ]; then cp -arf doc %{buildroot}/%{_pkgdocdir}; fi
if [ -d docs ]; then cp -arf docs %{buildroot}/%{_pkgdocdir}; fi
if [ -d example ]; then cp -arf example %{buildroot}/%{_pkgdocdir}; fi
if [ -d examples ]; then cp -arf examples %{buildroot}/%{_pkgdocdir}; fi
pushd %{buildroot}
if [ -d usr/lib ]; then
find usr/lib -type f -printf "/%h/%f\n" >> filelist.lst
fi
if [ -d usr/lib64 ]; then
find usr/lib64 -type f -printf "/%h/%f\n" >> filelist.lst
fi
if [ -d usr/bin ]; then
find usr/bin -type f -printf "/%h/%f\n" >> filelist.lst
fi
if [ -d usr/sbin ]; then
find usr/sbin -type f -printf "/%h/%f\n" >> filelist.lst
fi
touch doclist.lst
if [ -d usr/share/man ]; then
find usr/share/man -type f -printf "/%h/%f.gz\n" >> doclist.lst
fi
popd
mv %{buildroot}/filelist.lst .
mv %{buildroot}/doclist.lst .
%if %{with_tests} %if %{with tests}
%check %check
%{__python3} setup.py test %{__python3} setup.py test
%endif %endif
%files -n python3-pytest-virtualenv %files -n python3-pytest-virtualenv -f filelist.lst
%dir %{python3_sitelib}/*
%files help -f doclist.lst
%{_docdir}/*
%doc README.md CHANGES.md %doc README.md CHANGES.md
%{python3_sitelib}/*
%changelog %changelog
* Mon Nov 28 2022 wangjunqi <wangjunqi@kylinos.cn> - 1.7.0-1
- Update package to version 1.7.0
* Fri Sep 11 2020 wangyue<wangyue92@huawei.com> - 1.2.11-12 * Fri Sep 11 2020 wangyue<wangyue92@huawei.com> - 1.2.11-12
- Remove python2-pytest-virtualenv - Remove python2-pytest-virtualenv