From 5ccc792dc587f85fcf10ba5fa96c53ecfe74e9212298c7967d494127f37c354e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 12 Mar 2020 07:54:03 +0000 Subject: [PATCH 1/3] - Fix build without python2 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-twine?expand=0&rev=26 --- python-twine.changes | 5 +++++ python-twine.spec | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/python-twine.changes b/python-twine.changes index e276757..a93a0a0 100644 --- a/python-twine.changes +++ b/python-twine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 12 07:53:47 UTC 2020 - Tomáš Chvátal + +- Fix build without python2 + ------------------------------------------------------------------- Tue Feb 25 11:22:38 UTC 2020 - Ondřej Súkup diff --git a/python-twine.spec b/python-twine.spec index a52106e..e1a665b 100644 --- a/python-twine.spec +++ b/python-twine.spec @@ -17,12 +17,12 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%bcond_without python2 Name: python-twine Version: 1.15.0 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 BuildRequires: %{python_module pkginfo >= 1.4.2} @@ -44,9 +44,10 @@ Requires: python-tqdm >= 4.14 Requires(post): update-alternatives Requires(postun): update-alternatives Recommends: python-keyring -%ifpython2 -# tests/test_package.py will fail without pyblake2 +%if %{with python2} BuildRequires: python2-pyblake2 +%endif +%ifpython2 Recommends: python-pyblake2 %endif %python_subpackages From 004e910e3e153590e2c29f844546a05938213e8912487208a742c609949f584e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 26 Mar 2020 11:28:03 +0000 Subject: [PATCH 2/3] Accepting request 788516 from home:pgajdos:python sorry, forgot about it OBS-URL: https://build.opensuse.org/request/show/788516 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-twine?expand=0&rev=27 --- python-twine.changes | 15 +++++++++++++++ python-twine.spec | 20 +++++++++++--------- twine-1.15.0.tar.gz | 3 --- twine-3.1.1.tar.gz | 3 +++ 4 files changed, 29 insertions(+), 12 deletions(-) delete mode 100644 twine-1.15.0.tar.gz create mode 100644 twine-3.1.1.tar.gz diff --git a/python-twine.changes b/python-twine.changes index a93a0a0..70d1a97 100644 --- a/python-twine.changes +++ b/python-twine.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Mar 26 09:15:04 UTC 2020 - pgajdos@suse.com + +- version update to 3.1.1 + bug`548` Restore --non-interactive as a flag not expecting an argument. + :feature:`547` Add support for specifying --non-interactive as an environment variable. + :feature:`336` When a client certificate is indicated, all password processing is disabled. + :feature:`489` Add --non-interactive flag to abort upload rather than interactively prompt if credentials are missing. + :feature:`524` Twine now unconditionally requires the keyring library and no longer supports uninstalling keyring as a means to disable that functionality. Instead, use keyring --disable keyring functionality if necessary. + :feature:`518` Add Python 3.8 to classifiers. + bug`332 major` More robust handling of server response in --skip-existing + :feature:`437` Twine now requires Python 3.6 or later. Use pip 9 or pin to "twine<2" to install twine on older Python versions. + bug`491 major` Require requests 2.20 or later to avoid reported security vulnerabilities in earlier releases. +- python3 only package + ------------------------------------------------------------------- Thu Mar 12 07:53:47 UTC 2020 - Tomáš Chvátal diff --git a/python-twine.spec b/python-twine.spec index e1a665b..c0d75bc 100644 --- a/python-twine.spec +++ b/python-twine.spec @@ -17,21 +17,26 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%bcond_without python2 +%define skip_python2 1 Name: python-twine -Version: 1.15.0 +Version: 3.1.1 Release: 0 Summary: Collection of utilities for interacting with PyPI License: Apache-2.0 URL: https://github.com/pypa/twine Source: https://files.pythonhosted.org/packages/source/t/twine/twine-%{version}.tar.gz +BuildRequires: %{python_module jaraco.envs} +BuildRequires: %{python_module keyring} +BuildRequires: %{python_module munch} BuildRequires: %{python_module pkginfo >= 1.4.2} +BuildRequires: %{python_module portend} BuildRequires: %{python_module pretend} BuildRequires: %{python_module pytest} BuildRequires: %{python_module readme_renderer >= 21.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 setuptools_scm >= 1.15} BuildRequires: %{python_module tqdm >= 4.14} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -44,12 +49,6 @@ Requires: python-tqdm >= 4.14 Requires(post): update-alternatives Requires(postun): update-alternatives Recommends: python-keyring -%if %{with python2} -BuildRequires: python2-pyblake2 -%endif -%ifpython2 -Recommends: python-pyblake2 -%endif %python_subpackages %description @@ -72,7 +71,10 @@ sed -i '1s/^#!.*//' twine/__main__.py %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%pytest +# do not run integration tests +rm tests/test_integration.py +# test_check_status_code_for_wrong_repo_url is online test +%pytest -k 'not test_check_status_code_for_wrong_repo_url' %post %python_install_alternative twine diff --git a/twine-1.15.0.tar.gz b/twine-1.15.0.tar.gz deleted file mode 100644 index 69089a1..0000000 --- a/twine-1.15.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a3d22aab467b4682a22de4a422632e79d07eebd07ff2a7079effb13f8a693787 -size 139576 diff --git a/twine-3.1.1.tar.gz b/twine-3.1.1.tar.gz new file mode 100644 index 0000000..d12c43d --- /dev/null +++ b/twine-3.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d561a5e511f70275e5a485a6275ff61851c16ffcb3a95a602189161112d9f160 +size 146258 From 3e60255a026b10b355e97edcd9e2fdad71fcff57107845a7020eb623516bd934 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sun, 5 Apr 2020 07:40:16 +0000 Subject: [PATCH 3/3] - Update deps to really match up reality OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-twine?expand=0&rev=28 --- python-twine.changes | 5 +++++ python-twine.spec | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/python-twine.changes b/python-twine.changes index 70d1a97..0dcce3b 100644 --- a/python-twine.changes +++ b/python-twine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Apr 5 07:40:00 UTC 2020 - Tomáš Chvátal + +- Update deps to really match up reality + ------------------------------------------------------------------- Thu Mar 26 09:15:04 UTC 2020 - pgajdos@suse.com diff --git a/python-twine.spec b/python-twine.spec index c0d75bc..edbc696 100644 --- a/python-twine.spec +++ b/python-twine.spec @@ -25,30 +25,32 @@ Summary: Collection of utilities for interacting with PyPI License: Apache-2.0 URL: https://github.com/pypa/twine Source: https://files.pythonhosted.org/packages/source/t/twine/twine-%{version}.tar.gz +BuildRequires: %{python_module importlib-metadata} BuildRequires: %{python_module jaraco.envs} -BuildRequires: %{python_module keyring} +BuildRequires: %{python_module keyring >= 15.1} BuildRequires: %{python_module munch} BuildRequires: %{python_module pkginfo >= 1.4.2} BuildRequires: %{python_module portend} BuildRequires: %{python_module pretend} BuildRequires: %{python_module pytest} BuildRequires: %{python_module readme_renderer >= 21.0} -BuildRequires: %{python_module requests >= 2.17.0} +BuildRequires: %{python_module requests >= 2.20} BuildRequires: %{python_module requests-toolbelt >= 0.8.0} BuildRequires: %{python_module setuptools >= 0.7.0} BuildRequires: %{python_module setuptools_scm >= 1.15} BuildRequires: %{python_module tqdm >= 4.14} BuildRequires: fdupes BuildRequires: python-rpm-macros +Requires: python-importlib-metadata +Requires: python-keyring >= 15.1 Requires: python-pkginfo >= 1.4.2 Requires: python-readme_renderer >= 21.0 -Requires: python-requests >= 2.17.0 +Requires: python-requests >= 2.20 Requires: python-requests-toolbelt >= 0.8.0 Requires: python-setuptools >= 0.7.0 Requires: python-tqdm >= 4.14 Requires(post): update-alternatives Requires(postun): update-alternatives -Recommends: python-keyring %python_subpackages %description