commit python-twine for openSUSE:Factory

Hello community, here is the log from the commit of package python-twine for openSUSE:Factory checked in at 2019-02-13 10:00:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-twine (Old) and /work/SRC/openSUSE:Factory/.python-twine.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-twine" Wed Feb 13 10:00:05 2019 rev:5 rq:673043 version:1.12.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-twine/python-twine.changes 2018-05-29 16:49:24.678140333 +0200 +++ /work/SRC/openSUSE:Factory/.python-twine.new.28833/python-twine.changes 2019-02-13 10:00:16.965637102 +0100 @@ -1,0 +2,27 @@ +Sat Feb 9 19:52:43 CET 2019 - Matej Cepl + +- Add fix-keyring-support.patch fixing + gh#pypa/twine#408 + +------------------------------------------------------------------- +Sat Feb 9 13:45:55 UTC 2019 - Matej Cepl + +- Deduplicate installed files + +------------------------------------------------------------------- +Fri Jan 4 14:54:32 UTC 2019 - Hans-Peter Jansen + +- update to version 1.12.1 + - bug`404` Fix regression with upload exit code + +- update to version 1.12.0 + - feature`395 major` Add twine check command to check long description + - feature`392 major` Drop support for Python 3.3 + - feature`363` Empower --skip-existing for Artifactory repositories + - bug`367` Avoid MD5 when Python is compiled in FIPS mode + +- Fix source URL +- add python-readme_renderer dependency +- BuildRequire python2-pyblake2 for successful testing + +------------------------------------------------------------------- Old: ---- 1.11.0.tar.gz New: ---- fix-keyring-support.patch twine-1.12.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-twine.spec ++++++ --- /var/tmp/diff_new_pack.tj8ZYW/_old 2019-02-13 10:00:23.729635447 +0100 +++ /var/tmp/diff_new_pack.tj8ZYW/_new 2019-02-13 10:00:23.733635446 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-twine # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,28 +12,33 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-twine -Version: 1.11.0 +Version: 1.12.1 Release: 0 Summary: Collection of utilities for interacting with PyPI License: Apache-2.0 Group: Development/Languages/Python URL: https://github.com/pypa/twine -Source: https://github.com/pypa/twine/archive/%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/t/twine/twine-%{version}.tar.gz +# gh#pypa/twine#408 +Patch0: fix-keyring-support.patch BuildRequires: %{python_module pkginfo >= 1.4.2} BuildRequires: %{python_module pretend} BuildRequires: %{python_module pytest} +BuildRequires: %{python_module readme_renderer >= 24.0} BuildRequires: %{python_module requests >= 2.17.0} BuildRequires: %{python_module requests-toolbelt >= 0.8.0} BuildRequires: %{python_module setuptools >= 0.7.0} BuildRequires: %{python_module tqdm >= 4.14} +BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-pkginfo >= 1.4.2 +Requires: python-readme_renderer >= 24.0 Requires: python-requests >= 2.17.0 Requires: python-requests-toolbelt >= 0.8.0 Requires: python-setuptools >= 0.7.0 @@ -42,17 +47,22 @@ Requires(postun): update-alternatives Recommends: python-keyring %ifpython2 +# tests/test_package.py will fail without pyblake2 +BuildRequires: python2-pyblake2 Recommends: python-pyblake2 %endif %python_subpackages %description -Twine is a utility for interacting with PyPI. +Twine is a utility for publishing Python packages on PyPI. -Currently it only supports registering projects and uploading distributions. +Currently it supports registering projects, uploading distributions, and +checking, if descriptions will render correctly. %prep %setup -q -n twine-%{version} +%autopatch -p1 + sed -i '1s/^#!.*//' twine/__main__.py %build @@ -61,6 +71,7 @@ %install %python_install %python_clone -a %{buildroot}%{_bindir}/twine +%python_expand %fdupes %{buildroot}%{$python_sitelib} %check %python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_version} ++++++ fix-keyring-support.patch ++++++

From 5e80bfa08808b15a340687f8224d449fa906ac8e Mon Sep 17 00:00:00 2001 From: Dustin Ingram Date: Mon, 1 Oct 2018 16:30:32 -0500 Subject: [PATCH] Fix keyring support

--- twine/utils.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/twine/utils.py b/twine/utils.py index 83a1867..57eefb3 100644 --- a/twine/utils.py +++ b/twine/utils.py @@ -35,6 +35,11 @@ except ImportError: from urllib.parse import urlparse, urlunparse +try: + import keyring # noqa +except ImportError: + pass + from twine import exceptions # Shim for raw_input in python3 @@ -211,8 +216,7 @@ def get_password_from_keyring(system, username): return try: - import keyring - return keyring.get_password(system, username) + return sys.modules['keyring'].get_password(system, username) except Exception as exc: warnings.warn(str(exc))