From 9088def128f5bd4859fb5880da5fa85f7313e74081f771b58f376d900d90b4f5 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 9 Feb 2019 13:57:31 +0000 Subject: [PATCH 1/3] Accepting request 673000 from home:mcepl:branches:devel:languages:python - Deduplicate installed files OBS-URL: https://build.opensuse.org/request/show/673000 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-twine?expand=0&rev=16 --- python-twine.changes | 5 +++++ python-twine.spec | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/python-twine.changes b/python-twine.changes index d89f793..f73c360 100644 --- a/python-twine.changes +++ b/python-twine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 9 13:45:55 UTC 2019 - Matej Cepl + +- Deduplicate installed files + ------------------------------------------------------------------- Mon May 21 09:30:29 UTC 2018 - tchvatal@suse.com diff --git a/python-twine.spec b/python-twine.spec index c3daea6..2fa3aeb 100644 --- a/python-twine.spec +++ b/python-twine.spec @@ -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,7 +12,7 @@ # 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/ # @@ -32,6 +32,7 @@ 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-requests >= 2.17.0 @@ -61,6 +62,7 @@ sed -i '1s/^#!.*//' twine/__main__.py %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} From 00c51ee4184d0f132a19073f0dcc82438829389502894f6bb21095bc008c851d Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 9 Feb 2019 18:02:42 +0000 Subject: [PATCH 2/3] Accepting request 673031 from home:frispete:python - update to version 1.12.2 - bug`408` Fix regression where keyring is unconditionally disabled. - 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 OBS-URL: https://build.opensuse.org/request/show/673031 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-twine?expand=0&rev=17 --- 1.11.0.tar.gz | 3 --- python-twine.changes | 19 +++++++++++++++++++ python-twine.spec | 13 +++++++++---- twine-1.12.2.tar.gz | 3 +++ 4 files changed, 31 insertions(+), 7 deletions(-) delete mode 100644 1.11.0.tar.gz create mode 100644 twine-1.12.2.tar.gz diff --git a/1.11.0.tar.gz b/1.11.0.tar.gz deleted file mode 100644 index 5d0787c..0000000 --- a/1.11.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fdff00d235b964a9679fc0c127228eb83fb82b59552efb130cd878ace39f3473 -size 55301 diff --git a/python-twine.changes b/python-twine.changes index f73c360..4986acf 100644 --- a/python-twine.changes +++ b/python-twine.changes @@ -3,6 +3,25 @@ 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.2 + - bug`408` Fix regression where keyring is unconditionally disabled. + +- 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 + ------------------------------------------------------------------- Mon May 21 09:30:29 UTC 2018 - tchvatal@suse.com diff --git a/python-twine.spec b/python-twine.spec index 2fa3aeb..77c2eb0 100644 --- a/python-twine.spec +++ b/python-twine.spec @@ -18,16 +18,17 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-twine -Version: 1.11.0 +Version: 1.12.2 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 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} @@ -35,6 +36,7 @@ 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 @@ -43,14 +45,17 @@ Requires(post): update-alternatives 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} diff --git a/twine-1.12.2.tar.gz b/twine-1.12.2.tar.gz new file mode 100644 index 0000000..abaa26d --- /dev/null +++ b/twine-1.12.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c164c621ef3e04ee8c933559a2e4920e847005436b1a78703026ca5e011cf6c7 +size 62691 From c7ceb96cfdd0b2bdc9c6537678e2c36bdfab3bba370918808249738de54d3956 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 9 Feb 2019 20:21:16 +0000 Subject: [PATCH 3/3] Accepting request 673042 from home:mcepl:branches:devel:languages:python Add fix-keyring-support.patch fixing gh#pypa/twine#408 OBS-URL: https://build.opensuse.org/request/show/673042 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-twine?expand=0&rev=18 --- fix-keyring-support.patch | 35 +++++++++++++++++++++++++++++++++++ python-twine.changes | 9 ++++++--- python-twine.spec | 6 +++++- twine-1.12.1.tar.gz | 3 +++ twine-1.12.2.tar.gz | 3 --- 5 files changed, 49 insertions(+), 7 deletions(-) create mode 100644 fix-keyring-support.patch create mode 100644 twine-1.12.1.tar.gz delete mode 100644 twine-1.12.2.tar.gz diff --git a/fix-keyring-support.patch b/fix-keyring-support.patch new file mode 100644 index 0000000..1350eba --- /dev/null +++ b/fix-keyring-support.patch @@ -0,0 +1,35 @@ +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)) + diff --git a/python-twine.changes b/python-twine.changes index 4986acf..0fddfaf 100644 --- a/python-twine.changes +++ b/python-twine.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 @@ -6,9 +12,6 @@ Sat Feb 9 13:45:55 UTC 2019 - Matej Cepl ------------------------------------------------------------------- Fri Jan 4 14:54:32 UTC 2019 - Hans-Peter Jansen -- update to version 1.12.2 - - bug`408` Fix regression where keyring is unconditionally disabled. - - update to version 1.12.1 - bug`404` Fix regression with upload exit code diff --git a/python-twine.spec b/python-twine.spec index 77c2eb0..1d4f821 100644 --- a/python-twine.spec +++ b/python-twine.spec @@ -18,13 +18,15 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-twine -Version: 1.12.2 +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://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} @@ -59,6 +61,8 @@ checking, if descriptions will render correctly. %prep %setup -q -n twine-%{version} +%autopatch -p1 + sed -i '1s/^#!.*//' twine/__main__.py %build diff --git a/twine-1.12.1.tar.gz b/twine-1.12.1.tar.gz new file mode 100644 index 0000000..d6d7e0b --- /dev/null +++ b/twine-1.12.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d89bc6acafb31d124e6e5b295ef26ac77030bf098960c2a4c4e058335827c5c +size 69659 diff --git a/twine-1.12.2.tar.gz b/twine-1.12.2.tar.gz deleted file mode 100644 index abaa26d..0000000 --- a/twine-1.12.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c164c621ef3e04ee8c933559a2e4920e847005436b1a78703026ca5e011cf6c7 -size 62691