From 7e398de6d531a3f06264a810a393b1329bd3c603 Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Fri, 6 Apr 2018 15:46:42 +0000 Subject: [PATCH] [update to 12.0.1] Now load all backends, including the native backends, using entry points. Deprecate reliance on loading without entry points (with a warning presented). Ref #310. Dan Sully (1): Use 'entrypoints' instead of pkg_resources to avoid import time overhead. Hans-Peter Jansen (1): More specific DE hints Jakub Wilk (1): Fix typo in fail.Keyring method name Jason R. Coombs (26): Disable pytest-sugar until Frozenball/pytest-sugar#133 is addressed. Bring back pytest-sugar with a minimum version to support Pytest 3.4. Add link to keyrings.cryptfile. Push keyrings.alt to bottom and signal security concerns. Ref jaraco/keyrings.alt#25 Link to the third party backends rather than mentioning only keyrings.alt. It's macOS now Merge pull request #305 from jwilk-forks/spelling Save the pip cache across builds. Ref pypa/setuptools#1279. Add workaround for build failures on Python 3.7 (yaml/pyyaml#126). Run flake8 with tests. Add flake8 config to ignore common exclusions. Add comments to testing and docs extras to aid with merges. Add appveyor badge (commented). Disable RTD by default. Merge https://github.com/jaraco/skeleton Feed the hobgoblins (delint). Homebrew now installs Python 3 with pip by default for 'python' Now load all backends, including the native backends, using entry points. Deprecate reliance on loading without entry points (with a warning presented). Ref #310. Merge pull request #312 from dsully/master Update changelog. Ref #312. Try running ensurepip to see if macos tests will run Prefer 'macos' to 'osx' Merge branch 'master' into feature/310-all-backends-by-entry-points Try linking Python Add Python's bins to the path pyinstaller hook may now rely entirely on the entry points Ensure 'keyring.backends' is used consistently. On second thought, use a major version bump for clarity. Merge branch 'feature/310-all-backends-by-entry-points' Update changelog. Ref #314. 12.0.1 ------ * #314: No changes except to rebuild. 12.0.0 ------ * #310: Keyring now loads all backends through entry points. For most users, this release will be fully compatible. Some users may experience compatibility issues if entrypoints is not installed (as declared) or the metadata on which entrypoints relies is unavailable. For that reason, the package is released (NEWS truncated at 15 lines) --- ChangeLog | 24 ++++++++++++++++++++++++ Makefile | 2 +- keyring.spec | 16 +++++++++------- options.conf | 2 +- release | 2 +- upstream | 2 +- 6 files changed, 37 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8fc9dea..3bb359a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,27 @@ +12.0.1 +------ + +* #314: No changes except to rebuild. + +12.0.0 +------ + +* #310: Keyring now loads all backends through entry + points. + +For most users, this release will be fully compatible. Some +users may experience compatibility issues if entrypoints is +not installed (as declared) or the metadata on which entrypoints +relies is unavailable. For that reason, the package is released +with a major version bump. + +11.1.0 +------ + +* #312: Use ``entrypoints`` instead of pkg_resources to + avoid performance hit loading pkg_resources. Adds + a dependency on ``entrypoints``. + 11.0.0 ------ diff --git a/Makefile b/Makefile index 1ec662d..e87a8b6 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PKG_NAME := keyring -URL = https://pypi.debian.net/keyring/keyring-11.0.0.tar.gz +URL = https://pypi.python.org/packages/b9/f5/26c0d2195b2d3c2f3ecf11eff0903d5eca3a53d3999da2a7d4a2035cc769/keyring-12.0.1.tar.gz ARCHIVES = include ../common/Makefile.common diff --git a/keyring.spec b/keyring.spec index 87fc6e5..0e1fd69 100644 --- a/keyring.spec +++ b/keyring.spec @@ -3,10 +3,10 @@ # Generated by: autospec.py # Name : keyring -Version : 11.0.0 -Release : 48 -URL : https://pypi.debian.net/keyring/keyring-11.0.0.tar.gz -Source0 : https://pypi.debian.net/keyring/keyring-11.0.0.tar.gz +Version : 12.0.1 +Release : 49 +URL : https://pypi.python.org/packages/b9/f5/26c0d2195b2d3c2f3ecf11eff0903d5eca3a53d3999da2a7d4a2035cc769/keyring-12.0.1.tar.gz +Source0 : https://pypi.python.org/packages/b9/f5/26c0d2195b2d3c2f3ecf11eff0903d5eca3a53d3999da2a7d4a2035cc769/keyring-12.0.1.tar.gz Summary : Store and access your passwords safely. Group : Development/Tools License : MIT Python-2.0 @@ -14,7 +14,9 @@ Requires: keyring-bin Requires: keyring-legacypython Requires: keyring-python3 Requires: keyring-python +Requires: entrypoints Requires: secretstorage +BuildRequires : entrypoints BuildRequires : pbr BuildRequires : pip BuildRequires : python-dev @@ -65,7 +67,7 @@ python3 components for the keyring package. %prep -%setup -q -n keyring-11.0.0 +%setup -q -n keyring-12.0.1 %patch1 -p1 %build @@ -73,7 +75,7 @@ export http_proxy=http://127.0.0.1:9/ export https_proxy=http://127.0.0.1:9/ export no_proxy=localhost,127.0.0.1,0.0.0.0 export LANG=C -export SOURCE_DATE_EPOCH=1521660761 +export SOURCE_DATE_EPOCH=1523029595 python2 setup.py build -b py2 python3 setup.py build -b py3 @@ -83,7 +85,7 @@ export https_proxy=http://127.0.0.1:9/ export no_proxy=localhost,127.0.0.1,0.0.0.0 python setup.py ptr || : %install -export SOURCE_DATE_EPOCH=1521660761 +export SOURCE_DATE_EPOCH=1523029595 rm -rf %{buildroot} python2 -tt setup.py build -b py2 install --root=%{buildroot} --force python3 -tt setup.py build -b py3 install --root=%{buildroot} --force diff --git a/options.conf b/options.conf index 410dfe6..c41be05 100644 --- a/options.conf +++ b/options.conf @@ -1,6 +1,6 @@ [package] name = keyring -url = https://pypi.debian.net/keyring/keyring-11.0.0.tar.gz +url = https://pypi.python.org/packages/b9/f5/26c0d2195b2d3c2f3ecf11eff0903d5eca3a53d3999da2a7d4a2035cc769/keyring-12.0.1.tar.gz archives = giturl = https://github.com/jaraco/keyring.git diff --git a/release b/release index 21e72e8..95f9650 100644 --- a/release +++ b/release @@ -1 +1 @@ -48 +49 diff --git a/upstream b/upstream index c0a02ba..ef64255 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -586a5e18fc43ac44e382c5d958ec73766ef89bd9/keyring-11.0.0.tar.gz +2d4bc4706707ee3a8ad2b9de3f2532f0e00ef6c2/keyring-12.0.1.tar.gz