From bff165800c0204c82a29a245d6cdd4e4012cbb30de2487f1a8683adb54a20557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 8 Jan 2018 17:33:11 +0000 Subject: [PATCH] Accepting request 562589 from home:alarrosa:branches:devel:languages:python MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Converted to singlespec to generate a python3 package - Update to 4.8.2 * Merged in jeffwidman/virtualenvwrapper-2/jeffwidman/update-rtd-url-they-now-use-io-rather-t-1505539237232 (pull request #63) * Merged in jeffwidman/virtualenvwrapper-1/jeffwidman/add-python-36-to-pypi-trove-classifiers-1505539102243 (pull request #62) * Merged in jeffwidman/virtualenvwrapper/jeffwidman/update-readme-with-current-test-status--1505538852189 (pull request #61) * Update RTD url * Add python 3.6 to Pypi trove classifiers * Update readme with current test status - Update to 4.8.1 * New PBR doesn’t like provides_dist - Update to 4.8.0 * Merged in fix/263 (pull request #60) * Merged in fix/296 (pull request #59) * Fixing Documentation * Update supported versions * Adding python 3.6 * Fixing run_hook and tab_completion * First shot at Fixing #263 * Adding a note about package managers * Merged in zmwangx/virtualenvwrapper/always-export-virtualenvwrapper_hook_dir (pull request #55) * Typo fix * Merged in lendenmc/virtualenvwrapper (pull request #51) * Merged in SpotlightKid/virtualenvwrapper/bugfix/distutils-sysconfig (pull request #56) * Merged in dougharris/virtualenvwrapper (pull request #53) * Merged in kk6/virtualenvwrapper/fix/wipeenv_ignore_setuptools_dependencies (pull request #57) * Merged in erickmk/virtualenvwrapper/erickmk/command_refrst-edited-online-with-bitbuc-1491225971803 (pull request #58) * Update sentence to make it more clear * command_ref.rst edited online with Bitbucket * Fixes Issue #291 wipeenv ignore setuptools’s dependencies * Import distutils.sysconfig properly (fixes #167) OBS-URL: https://build.opensuse.org/request/show/562589 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-virtualenvwrapper?expand=0&rev=57 --- python-virtualenvwrapper.changes | 71 ++++++++++++++++++++++ python-virtualenvwrapper.spec | 75 +++++++++++------------- virtualenvwrapper-4.2-fix-bashisms.patch | 4 +- virtualenvwrapper-4.7.1.tar.gz | 3 - virtualenvwrapper-4.8.2.tar.gz | 3 + 5 files changed, 110 insertions(+), 46 deletions(-) delete mode 100644 virtualenvwrapper-4.7.1.tar.gz create mode 100644 virtualenvwrapper-4.8.2.tar.gz diff --git a/python-virtualenvwrapper.changes b/python-virtualenvwrapper.changes index 15ead2b..90b3fc4 100644 --- a/python-virtualenvwrapper.changes +++ b/python-virtualenvwrapper.changes @@ -1,3 +1,74 @@ +------------------------------------------------------------------- +Mon Jan 8 07:47:07 UTC 2018 - alarrosa@suse.com + +- Converted to singlespec to generate a python3 package +- Update to 4.8.2 + * Merged in jeffwidman/virtualenvwrapper-2/jeffwidman/update-rtd-url-they-now-use-io-rather-t-1505539237232 (pull request #63) + * Merged in jeffwidman/virtualenvwrapper-1/jeffwidman/add-python-36-to-pypi-trove-classifiers-1505539102243 (pull request #62) + * Merged in jeffwidman/virtualenvwrapper/jeffwidman/update-readme-with-current-test-status--1505538852189 (pull request #61) + * Update RTD url + * Add python 3.6 to Pypi trove classifiers + * Update readme with current test status +- Update to 4.8.1 + * New PBR doesn’t like provides_dist +- Update to 4.8.0 + * Merged in fix/263 (pull request #60) + * Merged in fix/296 (pull request #59) + * Fixing Documentation + * Update supported versions + * Adding python 3.6 + * Fixing run_hook and tab_completion + * First shot at Fixing #263 + * Adding a note about package managers + * Merged in zmwangx/virtualenvwrapper/always-export-virtualenvwrapper_hook_dir (pull request #55) + * Typo fix + * Merged in lendenmc/virtualenvwrapper (pull request #51) + * Merged in SpotlightKid/virtualenvwrapper/bugfix/distutils-sysconfig (pull request #56) + * Merged in dougharris/virtualenvwrapper (pull request #53) + * Merged in kk6/virtualenvwrapper/fix/wipeenv_ignore_setuptools_dependencies (pull request #57) + * Merged in erickmk/virtualenvwrapper/erickmk/command_refrst-edited-online-with-bitbuc-1491225971803 (pull request #58) + * Update sentence to make it more clear + * command_ref.rst edited online with Bitbucket + * Fixes Issue #291 wipeenv ignore setuptools’s dependencies + * Import distutils.sysconfig properly (fixes #167) + * virtualenvwrapper.sh: always export VIRTUALENVWRAPPER_HOOK_DIR + * Fixed case where alternate deactivate didn’t exist + * Makes workon more selective in its search for `deactivate` #285 + * Merged in sambrightman/virtualenvwrapper (pull request #52) + * Fix spelling mistake in error message + * Fix .kshrc sourcing error “’&>file’ is nonstandard” + * Merged in lonetwin/virtualenvwrapper (pull request #48) +- Update to 4.7.2 + * Baseline testing to python27 + * Fixing naming in tests + * Merged in phd/virtualenvwrapper (pull request #46) + * Ignore *.pyo byte-code files + * Fix docs: fix URLs whenever possible, change protocol to https + * Add wipeenv and allvirtualenv for lazy loading + * Remove one-time functions from the environment + * Fix the problem with lazy completion for bash + * Last set of docs + * Docs fixes + * Updating to virtualenvwrapper + * Last set of docs + * Docs fixes + * Merged in fix/issue-282-link-to-virtualenvwrapper (pull request #49) + * Updating to virtualenvwrapper + * Unset previously defined cd function rather than redefine it + * Merged in ismailsunni/virtualenvwrapper/ismailsunni/command_refrst-edited-online-with-bitbuc-1454377958615 (pull request #44) + * command_ref.rst edited online with Bitbucket Adding -d for remove extra path + * use a ref instead of hard-coded link in new tip + * Merged in kojiromike/virtualenvwrapper/deactivate-on-logout-tip (pull request #43) + * Add Deactivate-on-Logout Tip + * update REAMDE with new bug tracker URL + * more dir fixes for El Capitan + * add testing for python 3.5 + * temporary dir fixes for OS X El Capitan (10.11) + * update to work with tox 2.1.1 + * Merged in jveatch/virtualenvwrapper/fix-py26-logging (pull request #41) + * Pass stream as arg rather than kwarg to avoid py26 conflict. Fixes issue #274. StreamHandler arg was named strm in python 2.6 +- Rebase virtualenvwrapper-4.2-fix-bashisms.patch + ------------------------------------------------------------------- Mon Aug 15 14:51:56 UTC 2016 - toddrme2178@gmail.com diff --git a/python-virtualenvwrapper.spec b/python-virtualenvwrapper.spec index 9159c16..6485f4f 100644 --- a/python-virtualenvwrapper.spec +++ b/python-virtualenvwrapper.spec @@ -1,7 +1,7 @@ # # spec file for package python-virtualenvwrapper # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,32 +16,33 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%bcond_with test Name: python-virtualenvwrapper -Version: 4.7.1 +Version: 4.8.2 Release: 0 -Url: http://www.doughellmann.com/projects/virtualenvwrapper/ Summary: Enhancements to virtualenv -License: HPND +License: MIT Group: Development/Languages/Python -Source: https://pypi.python.org/packages/source/v/virtualenvwrapper/virtualenvwrapper-%{version}.tar.gz +Url: https://virtualenvwrapper.readthedocs.io/ +Source: https://files.pythonhosted.org/packages/source/v/virtualenvwrapper/virtualenvwrapper-%{version}.tar.gz Patch: virtualenvwrapper-4.2-fix-bashisms.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: python-devel -BuildRequires: python-pbr -BuildRequires: python-setuptools -BuildRequires: python-stevedore -BuildRequires: python-virtualenv -Requires: python-virtualenv-clone +BuildRequires: %{python_module devel} +BuildRequires: %{python_module pbr} +BuildRequires: %{python_module setuptools} +BuildRequires: python-rpm-macros +%if %{with test} +BuildRequires: %{python_module stevedore} +BuildRequires: %{python_module virtualenv-clone} +BuildRequires: %{python_module virtualenv} +%endif +BuildRequires: fdupes Requires: python-stevedore Requires: python-virtualenv Requires: python-virtualenv-clone -Requires(post): update-alternatives -Requires(preun): update-alternatives -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else BuildArch: noarch -%endif + +%python_subpackages %description virtualenvwrapper is a set of extensions to Ian Bicking's virtualenv @@ -65,43 +66,35 @@ conflicts in their dependencies. sed -i -e '1i#!/bin/sh' virtualenvwrapper.sh %build -python setup.py build +%python_build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} - +%python_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} mv %{buildroot}%{_bindir}/virtualenvwrapper.sh %{buildroot}%{_bindir}/virtualenvwrapper mv %{buildroot}%{_bindir}/virtualenvwrapper_lazy.sh %{buildroot}%{_bindir}/virtualenvwrapper_lazy # Prepare for update-alternatives usage mkdir -p %{buildroot}%{_sysconfdir}/alternatives for p in virtualenvwrapper virtualenvwrapper_lazy ; do - mv %{buildroot}%{_bindir}/$p %{buildroot}%{_bindir}/$p-%{py_ver} - ln -s -f %{_sysconfdir}/alternatives/$p %{buildroot}%{_bindir}/$p + %python_clone -a %{buildroot}%{_bindir}/$p done +#%%check +#python3.6 -m venv --system-site-packages --without-pip venvwrapper-3.6 +#sh tests/run_tests $PWD/venvwrapper-3.6 + %post -%_sbindir/update-alternatives \ - --install %{_bindir}/virtualenvwrapper virtualenvwrapper %{_bindir}/virtualenvwrapper-%{py_ver} 30 \ - --slave %{_bindir}/virtualenvwrapper_lazy virtualenvwrapper_lazy %{_bindir}/virtualenvwrapper_lazy-%{py_ver} +%python_install_alternative virtualenvwrapper virtualenvwrapper_lazy -%preun -if [ $1 -eq 0 ] ; then - %_sbindir/update-alternatives --remove virtualenvwrapper %{_bindir}/virtualenvwrapper-%{py_ver} -fi +%postun +%python_uninstall_alternative virtualenvwrapper -# %check -# sh tests/run_tests - -%files +%files %{python_files} %defattr(-,root,root,-) -%doc AUTHORS ChangeLog LICENSE README.txt README.es.rst README.ja.rst -%{_bindir}/virtualenvwrapper -%{_bindir}/virtualenvwrapper_lazy -%{_bindir}/virtualenvwrapper-%{py_ver} -%{_bindir}/virtualenvwrapper_lazy-%{py_ver} -%ghost %{_sysconfdir}/alternatives/virtualenvwrapper -%ghost %{_sysconfdir}/alternatives/virtualenvwrapper_lazy +%doc AUTHORS ChangeLog LICENSE README.es.rst README.ja.rst README.txt +%python_alternative %{_bindir}/virtualenvwrapper +%python_alternative %{_bindir}/virtualenvwrapper_lazy %{python_sitelib}/* %changelog diff --git a/virtualenvwrapper-4.2-fix-bashisms.patch b/virtualenvwrapper-4.2-fix-bashisms.patch index e17afe9..c0720ef 100644 --- a/virtualenvwrapper-4.2-fix-bashisms.patch +++ b/virtualenvwrapper-4.2-fix-bashisms.patch @@ -5,5 +5,5 @@ diff -Ndur virtualenvwrapper-4.2/virtualenvwrapper_lazy.sh virtualenvwrapper-4.2 -#!/bin/sh +#!/bin/bash # Alternative startup script for faster login times. - - export _VIRTUALENVWRAPPER_API="$_VIRTUALENVWRAPPER_API mkvirtualenv rmvirtualenv lsvirtualenv showvirtualenv workon add2virtualenv cdsitepackages cdvirtualenv lssitepackages toggleglobalsitepackages cpvirtualenv setvirtualenvproject mkproject cdproject mktmpenv" + + export _VIRTUALENVWRAPPER_API="$_VIRTUALENVWRAPPER_API mkvirtualenv rmvirtualenv lsvirtualenv showvirtualenv workon add2virtualenv cdsitepackages cdvirtualenv lssitepackages toggleglobalsitepackages cpvirtualenv setvirtualenvproject mkproject cdproject mktmpenv wipeenv allvirtualenv" diff --git a/virtualenvwrapper-4.7.1.tar.gz b/virtualenvwrapper-4.7.1.tar.gz deleted file mode 100644 index 9b4c282..0000000 --- a/virtualenvwrapper-4.7.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3bf73ede42a689adeedc8ac85662cb539665d3d029459bc8d3e6835ecd81ffde -size 89930 diff --git a/virtualenvwrapper-4.8.2.tar.gz b/virtualenvwrapper-4.8.2.tar.gz new file mode 100644 index 0000000..36ce77b --- /dev/null +++ b/virtualenvwrapper-4.8.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18d8e4c500c4c4ee794f704e050cf2bbb492537532a4521d1047e7dd1ee4e374 +size 91331