From 33e019dfead31f88ce9a0b2b0eb63087968952867c6d1bf2dec357d0b4809238 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 16 Sep 2019 10:44:26 +0000 Subject: [PATCH 1/2] - Update to 16.7.5: * fix powershell activation when sourced (#1398) * fix regression - sh activation script not working under sh (only bash) (#1396) * activate.ps1 syntax and style updated to follow PSStyleAnalyzer rules (#1371) * Allow creating virtual environments for 3.xy. (#1385) * Report error when running activate scripts directly * Extend the LICENSE search paths list by lib64/pythonX.Y to support Linux vendors who install their Python to /usr/lib64/pythonX.Y * Raise an error if the target path contains the operating systems path separator (using this would break our activation scripts) * Drop Jython support * Add tests covering prompt manipulation during activation/deactivation, and harmonize behavior of all supported shells MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Update to 16.4.3: * Revert the symlink fix, causing debian packaging issues. (#1390) * Fix license() builtin by copying the LICENSE file into the virtualenv - by asottile. (#1317) * fixes the scenario where the python base install is symlinked with relative symlinks (#490) * Use importlib over imp in virtualenv.py for python >= 3.4 - by Anthony Sottile (#1293) * Copy or link PyPy header files instead of include directory itself (#1302) * Allow virtualenv creation with older pip not having config command correspondingly disabling configuration related features (such as pip cert setting) in this case. (#1303) * Use importlib over deprecated imp` in ``distutils/__init__.py for python 3 - by Anthony Sottile (#955) * Preserve cert option defined in pip.conf or environment variable. (#1273) * fixed a ResourceWarning: unclosed file in call_subprocess() - by Mickaël Schoentgen (#1277) * pre-import some built-in modules in site.py on PyPy according to PyPy's site.py - by microdog (#1281) * Copy files from sys.exec_prefix only if it is really different path than used prefix, bugfix for #1270 (#1282) * copyfile handles relative symlinks and symlinks to symlinks, avoiding problems when Python was installed using stow or homebrew. (#268) * Fix preserving of original path when using fish and a subshell. (#904) * Drop the source layout of the project, going back to how the source was laid out before 16.1.0. (#1241) * Fix bootstrap script generation broken with 16.0.0. Support now both CPython, pypy, jython. (#1244) * lib64 symlink is again relative (as was with < 16.1.0). (#1248) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-virtualenv?expand=0&rev=70 --- python-virtualenv.changes | 35 +++++++++++++++++++++++++++++++++++ python-virtualenv.spec | 15 ++++++++++----- virtualenv-16.1.0.tar.gz | 3 --- virtualenv-16.7.5.tar.gz | 3 +++ 4 files changed, 48 insertions(+), 8 deletions(-) delete mode 100644 virtualenv-16.1.0.tar.gz create mode 100644 virtualenv-16.7.5.tar.gz diff --git a/python-virtualenv.changes b/python-virtualenv.changes index fd82ffc..d652c26 100644 --- a/python-virtualenv.changes +++ b/python-virtualenv.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Mon Sep 16 10:20:57 UTC 2019 - Tomáš Chvátal + +- Update to 16.7.5: + * fix powershell activation when sourced (#1398) + * fix regression - sh activation script not working under sh (only bash) (#1396) + * activate.ps1 syntax and style updated to follow PSStyleAnalyzer rules (#1371) + * Allow creating virtual environments for 3.xy. (#1385) + * Report error when running activate scripts directly + * Extend the LICENSE search paths list by lib64/pythonX.Y to support Linux vendors who install their Python to /usr/lib64/pythonX.Y + * Raise an error if the target path contains the operating systems path separator (using this would break our activation scripts) + * Drop Jython support + * Add tests covering prompt manipulation during activation/deactivation, and harmonize behavior of all supported shells + +------------------------------------------------------------------- +Mon Mar 4 12:35:12 UTC 2019 - Tomáš Chvátal + +- Update to 16.4.3: + * Revert the symlink fix, causing debian packaging issues. (#1390) + * Fix license() builtin by copying the LICENSE file into the virtualenv - by asottile. (#1317) + * fixes the scenario where the python base install is symlinked with relative symlinks (#490) + * Use importlib over imp in virtualenv.py for python >= 3.4 - by Anthony Sottile (#1293) + * Copy or link PyPy header files instead of include directory itself (#1302) + * Allow virtualenv creation with older pip not having config command correspondingly disabling configuration related features (such as pip cert setting) in this case. (#1303) + * Use importlib over deprecated imp` in ``distutils/__init__.py for python 3 - by Anthony Sottile (#955) + * Preserve cert option defined in pip.conf or environment variable. (#1273) + * fixed a ResourceWarning: unclosed file in call_subprocess() - by Mickaël Schoentgen (#1277) + * pre-import some built-in modules in site.py on PyPy according to PyPy's site.py - by microdog (#1281) + * Copy files from sys.exec_prefix only if it is really different path than used prefix, bugfix for #1270 (#1282) + * copyfile handles relative symlinks and symlinks to symlinks, avoiding problems when Python was installed using stow or homebrew. (#268) + * Fix preserving of original path when using fish and a subshell. (#904) + * Drop the source layout of the project, going back to how the source was laid out before 16.1.0. (#1241) + * Fix bootstrap script generation broken with 16.0.0. Support now both CPython, pypy, jython. (#1244) + * lib64 symlink is again relative (as was with < 16.1.0). (#1248) + ------------------------------------------------------------------- Tue Feb 5 20:45:40 UTC 2019 - Nicolas Bock diff --git a/python-virtualenv.spec b/python-virtualenv.spec index 755e736..6b0f099 100644 --- a/python-virtualenv.spec +++ b/python-virtualenv.spec @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-virtualenv -Version: 16.1.0 +Version: 16.7.5 Release: 0 Summary: Virtual Python Environment builder License: MIT @@ -26,10 +26,13 @@ Group: Development/Languages/Python URL: http://www.virtualenv.org/ Source: https://files.pythonhosted.org/packages/source/v/virtualenv/virtualenv-%{version}.tar.gz BuildRequires: %{python_module mock} +BuildRequires: %{python_module pip} +BuildRequires: %{python_module pypiserver} +BuildRequires: %{python_module pytest-localserver} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} +BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python Requires: python-setuptools Requires(post): update-alternatives Requires(postun): update-alternatives @@ -66,12 +69,14 @@ libraries either). %install %python_install +%python_expand fdupes %{buildroot}%{$python_sitelib} %python_clone -a %{buildroot}%{_bindir}/virtualenv %check -export PYTHONPATH=src -# test broken upstream https://github.com/pypa/virtualenv/issues/530 -%python_expand py.test-%{$python_bin_suffix} -k 'not test_always_copy_option' -vv +# test_bootstrap is tied to python2 command calls, skip it +# test_always_copy_option does not handle system install dirs in /usr/lib64 +# test_wheel_invocation_dash_p or test_use_from_wheel or test_wheel_contains or test_wheel_basic_invocation; online tests +%pytest -k 'not (test_always_copy_option or test_bootstrap or test_use_from_wheel or test_wheel_contains or test_wheel_basic_invocation or test_wheel_invocation_dash_p)' %post %python_install_alternative virtualenv diff --git a/virtualenv-16.1.0.tar.gz b/virtualenv-16.1.0.tar.gz deleted file mode 100644 index 8249e9a..0000000 --- a/virtualenv-16.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f899fafcd92e1150f40c8215328be38ff24b519cd95357fa6e78e006c7638208 -size 1977229 diff --git a/virtualenv-16.7.5.tar.gz b/virtualenv-16.7.5.tar.gz new file mode 100644 index 0000000..94288d5 --- /dev/null +++ b/virtualenv-16.7.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f78d81b62d3147396ac33fc9d77579ddc42cc2a98dd9ea38886f616b33bc7fb2 +size 5111957 From db4fbaa21673a6648b70033fed735139e401d05eb8d119e300ed81e8500f779f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 17 Sep 2019 18:07:53 +0000 Subject: [PATCH 2/2] - Use multibuild to avoid cycles with pytest OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-virtualenv?expand=0&rev=71 --- _multibuild | 3 +++ python-virtualenv.changes | 5 +++++ python-virtualenv.spec | 19 ++++++++++++++++++- 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 _multibuild diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..fcc7b97 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + test + diff --git a/python-virtualenv.changes b/python-virtualenv.changes index d652c26..330b155 100644 --- a/python-virtualenv.changes +++ b/python-virtualenv.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 17 18:01:51 UTC 2019 - Tomáš Chvátal + +- Use multibuild to avoid cycles with pytest + ------------------------------------------------------------------- Mon Sep 16 10:20:57 UTC 2019 - Tomáš Chvátal diff --git a/python-virtualenv.spec b/python-virtualenv.spec index 6b0f099..12b6735 100644 --- a/python-virtualenv.spec +++ b/python-virtualenv.spec @@ -17,7 +17,15 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -Name: python-virtualenv +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%define psuffix -test +%bcond_without test +%else +%define psuffix %{nil} +%bcond_with test +%endif +Name: python-virtualenv%{psuffix} Version: 16.7.5 Release: 0 Summary: Virtual Python Environment builder @@ -25,11 +33,14 @@ License: MIT Group: Development/Languages/Python URL: http://www.virtualenv.org/ Source: https://files.pythonhosted.org/packages/source/v/virtualenv/virtualenv-%{version}.tar.gz +%if %{with test} BuildRequires: %{python_module mock} BuildRequires: %{python_module pip} BuildRequires: %{python_module pypiserver} BuildRequires: %{python_module pytest-localserver} BuildRequires: %{python_module pytest} +BuildRequires: %{python_module virtualenv >= %{version}} +%endif BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -68,16 +79,21 @@ libraries either). %python_build %install +%if !%{with test} %python_install %python_expand fdupes %{buildroot}%{$python_sitelib} %python_clone -a %{buildroot}%{_bindir}/virtualenv +%endif %check +%if %{with test} # test_bootstrap is tied to python2 command calls, skip it # test_always_copy_option does not handle system install dirs in /usr/lib64 # test_wheel_invocation_dash_p or test_use_from_wheel or test_wheel_contains or test_wheel_basic_invocation; online tests %pytest -k 'not (test_always_copy_option or test_bootstrap or test_use_from_wheel or test_wheel_contains or test_wheel_basic_invocation or test_wheel_invocation_dash_p)' +%endif +%if !%{with test} %post %python_install_alternative virtualenv @@ -90,5 +106,6 @@ libraries either). %{python_sitelib}/virtualenv* %python_alternative %{_bindir}/virtualenv %pycache_only %{python_sitelib}/__pycache__ +%endif %changelog