diff --git a/keyring-10.2.tar.gz b/keyring-10.2.tar.gz deleted file mode 100644 index 852360a..0000000 --- a/keyring-10.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf49be09b31db401791bde1799da30d6926e7de2f0fb836c3dfc85aa5538a572 -size 37110 diff --git a/keyring-10.3.2.tar.gz b/keyring-10.3.2.tar.gz new file mode 100644 index 0000000..3fc2e32 --- /dev/null +++ b/keyring-10.3.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f462698bc8b96ef5f9fb31d392611f416c808a8244d679fb02530b72bab01ad6 +size 39244 diff --git a/python-keyring.changes b/python-keyring.changes index 684eae1..fd8cf52 100644 --- a/python-keyring.changes +++ b/python-keyring.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed May 3 16:03:08 UTC 2017 - toddrme2178@gmail.com + +- Implement single-spec version. +- Fix source URL. +- Update to version 10.3.2 + * #267: More leniently unescape lowercased characters as + they get re-cased by ConfigParser. +- Update to version 10.3.1 + * #266: Use private compatibity model rather than six to + avoid the dependency. +- Update to version 10.3 + * #264: Implement devpi hook for supplying a password when + logging in with `devpi `_ + client. + * #260: For macOS, added initial API support for internet + passwords. + ------------------------------------------------------------------- Mon Jan 16 18:18:33 UTC 2017 - michael@stroeder.com diff --git a/python-keyring.spec b/python-keyring.spec index ffe3b07..48d3b11 100644 --- a/python-keyring.spec +++ b/python-keyring.spec @@ -16,31 +16,34 @@ # +%bcond_without tests + +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-keyring -Version: 10.2 +Version: 10.3.2 Release: 0 Url: https://github.com/jaraco/keyring Summary: Store and access your passwords safely License: Python-2.0 and MIT Group: Development/Languages/Python -Source: https://pypi.io/packages/source/k/keyring/keyring-%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/k/keyring/keyring-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: python-devel >= 2.7 -BuildRequires: python-setuptools -BuildRequires: python-setuptools_scm >= 1.15.0 +BuildRequires: fdupes +BuildRequires: python-rpm-macros +BuildRequires: %{python_module devel} +BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module setuptools_scm >= 1.15.0} +%if %{with tests} # Test requirements: +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module SecretStorage} +# Python 2 test requirements: BuildRequires: python-mock -BuildRequires: python-pytest -BuildRequires: python-tox -BuildRequires: python-SecretStorage -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -BuildRequires: python-unittest2 %endif Requires: python-SecretStorage Requires: python-setuptools -Requires(post): update-alternatives -Requires(postun): update-alternatives BuildArch: noarch +%python_subpackages %description The Python keyring lib provides a easy way to access the system keyring service @@ -52,36 +55,26 @@ from python. It can be used in any application that needs safe password storage. sed -i '/^#!/d' keyring/cli.py %build -python setup.py build +%python_build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} - -# update-alternatives -mv %{buildroot}%{_bindir}/keyring %{buildroot}%{_bindir}/keyring-%{py_ver} -mkdir -p %{buildroot}%{_sysconfdir}/alternatives -touch %{buildroot}%{_sysconfdir}/alternatives/keyring -ln -sf %{_sysconfdir}/alternatives/keyring %{buildroot}%{_bindir}/keyring +%python_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} +%if %{with tests} %check -export PYTHONPATH="%{buildroot}%{python_sitelib}:$PYTHONPATH" -py.test +pushd docs +%{python_expand export PYTHONPATH="%{buildroot}%{$python_sitelib}" +py.test-%{$python_bin_suffix} --pyargs keyring.tests +} +popd +%endif -%post -update-alternatives \ - --install %{_bindir}/keyring keyring %{_bindir}/keyring-%{py_ver} 20 - -%postun -if [ $1 -eq 0 ] ; then - update-alternatives --remove keyring %{_bindir}/keyring-%{py_ver} -fi - -%files +%files %{python_files} %defattr(-,root,root) %doc README.rst CHANGES.rst -%ghost %{_sysconfdir}/alternatives/keyring -%{_bindir}/keyring -%{_bindir}/keyring-%{py_ver} -%{python_sitelib}/* +%python3_only %{_bindir}/keyring +%{python_sitelib}/keyring-%{version}-py*.egg-info +%{python_sitelib}/keyring/ %changelog