forked from pool/python-twine
		
	Accepting request 680732 from home:apersaud:branches:devel:languages:python
update to latest version OBS-URL: https://build.opensuse.org/request/show/680732 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-twine?expand=0&rev=20
This commit is contained in:
		| @@ -1,35 +0,0 @@ | ||||
| From 5e80bfa08808b15a340687f8224d449fa906ac8e Mon Sep 17 00:00:00 2001 | ||||
| From: Dustin Ingram <di@users.noreply.github.com> | ||||
| 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)) | ||||
|   | ||||
| @@ -1,3 +1,32 @@ | ||||
| ------------------------------------------------------------------- | ||||
| Sat Mar  2 04:53:11 UTC 2019 - Arun Persaud <arun@gmx.de> | ||||
|  | ||||
| - specfile: | ||||
|   * be more specific in %files section | ||||
|   * remove patch fix-keyring-support.patch, included upstream | ||||
|  | ||||
| - update to version 1.13.0: | ||||
|   * bug`452` Restore prompts while retaining support for suppressing | ||||
|     prompts. | ||||
|   * bug`447` Avoid requests-toolbelt to 0.9.0 to prevent attempting to | ||||
|     use openssl when it isn't available. | ||||
|   * :feature:`427` Add disable_progress_bar option to disable tqdm. | ||||
|   * :feature:`426` Allow defining an empty username and password in | ||||
|     .pypirc. | ||||
|   * bug`441` Only install pyblake2 if needed. | ||||
|   * bug`444` Use io.StringIO instead of StringIO. | ||||
|   * bug`436` Use modern Python language features. | ||||
|   * :support:`439` Refactor tox env and travis config. | ||||
|   * bug`435` Specify python_requires in setup.py | ||||
|   * bug`432` Use https URLs everywhere. | ||||
|   * bug`428` Fix --skip-existing for Nexus Repos. | ||||
|   * :feature:`419` Support keyring.get_credential. | ||||
|   * :feature:`418` Support keyring.get_username_and_password. | ||||
|   * bug`421` Remove unnecessary usage of readme_render.markdown. | ||||
|   * :feature:" Add Python 3.7 to classifiers. | ||||
|   * bug`412` Don't crash if there's no package description. | ||||
|   * bug`408` Fix keyring support. | ||||
|  | ||||
| ------------------------------------------------------------------- | ||||
| Sat Feb  9 19:52:43 CET 2019 - Matej Cepl <mcepl@suse.com> | ||||
|  | ||||
|   | ||||
| @@ -18,15 +18,13 @@ | ||||
|  | ||||
| %{?!python_module:%define python_module() python-%{**} python3-%{**}} | ||||
| Name:           python-twine | ||||
| Version:        1.12.1 | ||||
| Version:        1.13.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 | ||||
| # gh#pypa/twine#408 | ||||
| Patch0:         fix-keyring-support.patch | ||||
| BuildRequires:  %{python_module pkginfo >= 1.4.2} | ||||
| BuildRequires:  %{python_module pretend} | ||||
| BuildRequires:  %{python_module pytest} | ||||
| @@ -56,12 +54,11 @@ Recommends:     python-pyblake2 | ||||
| %description | ||||
| Twine is a utility for publishing Python packages on PyPI. | ||||
|  | ||||
| Currently it supports registering projects, uploading distributions, and  | ||||
| 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 | ||||
|  | ||||
| @@ -85,7 +82,10 @@ sed -i '1s/^#!.*//' twine/__main__.py | ||||
| %files %{python_files} | ||||
| %doc AUTHORS README.rst | ||||
| %license LICENSE | ||||
| %{python_sitelib}/* | ||||
| %dir %{python_sitelib}/twine | ||||
| %dir %{python_sitelib}/twine-%{version}-py*.egg-info | ||||
| %{python_sitelib}/twine/* | ||||
| %{python_sitelib}/twine-%{version}-py*.egg-info/* | ||||
| %python_alternative %{_bindir}/twine | ||||
|  | ||||
| %changelog | ||||
|   | ||||
| @@ -1,3 +0,0 @@ | ||||
| version https://git-lfs.github.com/spec/v1 | ||||
| oid sha256:7d89bc6acafb31d124e6e5b295ef26ac77030bf098960c2a4c4e058335827c5c | ||||
| size 69659 | ||||
							
								
								
									
										3
									
								
								twine-1.13.0.tar.gz
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								twine-1.13.0.tar.gz
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,3 @@ | ||||
| version https://git-lfs.github.com/spec/v1 | ||||
| oid sha256:d6c29c933ecfc74e9b1d9fa13aa1f87c5d5770e119f5a4ce032092f0ff5b14dc | ||||
| size 68643 | ||||
		Reference in New Issue
	
	Block a user