Hello community, here is the log from the commit of package python-keyring for openSUSE:Factory checked in at 2016-11-17 12:23:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-keyring (Old) and /work/SRC/openSUSE:Factory/.python-keyring.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-keyring" Changes: -------- --- /work/SRC/openSUSE:Factory/python-keyring/python-keyring.changes 2016-09-08 17:37:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-keyring.new/python-keyring.changes 2016-11-17 12:23:37.000000000 +0100 @@ -1,0 +2,17 @@ +Sat Nov 12 15:17:19 UTC 2016 - [email protected] + +- update to 10.0.2 +- build requires python-tox instead of python-pytest-runner +10.0.2 +----- +* #247: Restored console script. +10.0.1 +------ +* Update readme to reflect test recommendations. +10.0 +---- +* Drop support for Python 3.2. +* Test suite now uses tox instead of pytest-runner. + Test requirements are now defined in tests/requirements.txt. + +------------------------------------------------------------------- @@ -3,0 +21 @@ +- updated project URL Old: ---- keyring-9.3.1.tar.gz New: ---- keyring-10.0.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-keyring.spec ++++++ --- /var/tmp/diff_new_pack.BCA10k/_old 2016-11-17 12:23:38.000000000 +0100 +++ /var/tmp/diff_new_pack.BCA10k/_new 2016-11-17 12:23:38.000000000 +0100 @@ -17,9 +17,9 @@ Name: python-keyring -Version: 9.3.1 +Version: 10.0.2 Release: 0 -Url: https://bitbucket.org/kang/python-keyring-lib +Url: https://github.com/jaraco/keyring Summary: Store and access your passwords safely License: Python-2.0 and MIT Group: Development/Languages/Python @@ -31,7 +31,8 @@ # Test requirements: BuildRequires: python-mock BuildRequires: python-pytest -BuildRequires: python-pytest-runner +BuildRequires: python-tox +BuildRequires: python-SecretStorage %if 0%{?suse_version} && 0%{?suse_version} <= 1110 BuildRequires: python-unittest2 %endif @@ -39,16 +40,7 @@ Requires: python-setuptools Requires(post): update-alternatives Requires(postun): update-alternatives -Provides: python-keyring-kde = %{version} -Obsoletes: python-keyring-kde < %{version} -Provides: python-keyring-gnome = %{version} -Obsoletes: python-keyring-gnome < %{version} -Supplements: packageand(kdebase4-workspace:kwalletmanager) -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else BuildArch: noarch -%endif %description The Python keyring lib provides a easy way to access the system keyring service @@ -56,6 +48,8 @@ %prep %setup -q -n keyring-%{version} +# For rpmlint warning: remove shebang from python library: +sed -i '/^#!/d' keyring/cli.py %build python setup.py build @@ -70,6 +64,7 @@ ln -sf %{_sysconfdir}/alternatives/keyring %{buildroot}%{_bindir}/keyring %check +export PYTHONPATH="%{buildroot}%{python_sitelib}:$PYTHONPATH" py.test %post ++++++ keyring-9.3.1.tar.gz -> keyring-10.0.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/keyring-9.3.1/.hgtags new/keyring-10.0.2/.hgtags --- old/keyring-9.3.1/.hgtags 2016-07-14 16:12:11.000000000 +0200 +++ new/keyring-10.0.2/.hgtags 1970-01-01 01:00:00.000000000 +0100 @@ -1,117 +0,0 @@ -eca8f4a35834f58a4008048a3c5c5c89592cb260 0.2 -24dcf507483ee9fe0f078f2d45f9a3e231d13ade remove -24dcf507483ee9fe0f078f2d45f9a3e231d13ade remove -0000000000000000000000000000000000000000 remove -eca8f4a35834f58a4008048a3c5c5c89592cb260 0.2 -0000000000000000000000000000000000000000 0.2 -0000000000000000000000000000000000000000 0.2 -eca8f4a35834f58a4008048a3c5c5c89592cb260 0.2 -4575a13448f8a85ab6553fba033c5a2ec41dd21c 0.3 -bf5a92e6ad9bd1a613ced83cbfa86d4b54117142 0.4 -e1cf2f1a4a5306da54e485249e54e8f462a8db5e 0.5 -e1cf2f1a4a5306da54e485249e54e8f462a8db5e 0.5 -eb4ea659c9cf0c47b758094b894f7ccc36325aa6 0.5 -151f79315c8250982ce2c8af27dad16009a0edb4 0.5.1 -f43ff1d34884a6b8cba6574960cdcbe126140c59 0.6.1 -a604d2b8549c8ac97f7537609191ba32292b3d25 0.6.2 -a367ade70d37206891f0653f68472fbcc59d97f1 0.7 -695fde92f9cf7dd7dd5ef6a03b37db1271d01dcc 0.7.1 -fff4872e0b6be02ee2c7a6802d8f2c7129d210aa 0.8 -0dcd2ef344a060b130833d5a13f3dab2d1fa8f15 0.8.1 -584c7bbcdad57a8871a0bd705f159b60f392f0cd 0.9 -4ad9b5e9a3ac1dda8f3734bf30e7fc1981ed14d4 0.9.1 -4ad9b5e9a3ac1dda8f3734bf30e7fc1981ed14d4 0.9.1 -0000000000000000000000000000000000000000 0.9.1 -0000000000000000000000000000000000000000 0.9.1 -ab8f14be5e08b75db21a775481474a9e9a12083f 0.9.1 -5038d4dc7d3f558acabb050700eace017320805a 0.9.2 -da76a647919299ced33de2cc56ad9e62330fa7ad 0.10 -b446509c021926096cd80f058b273ac8aaf7fa40 0.9.3 -1107cbf1081dc26fc0168b0d8caf5c24d39c1000 0.10.1 -50feafd06305b562ffaf7b92ba058fd940b1f679 1.0 -aa99317ef95e587224faed28c2eb598cccca32d4 1.1 -e16a5f97ae32c8e48abe035e9e31ffb848933209 1.1.1 -e16a5f97ae32c8e48abe035e9e31ffb848933209 1.1.1 -0000000000000000000000000000000000000000 1.1.1 -0000000000000000000000000000000000000000 1.1.1 -e2a55056a93d8af0f569e53fef899656d9f25fc5 1.1.1 -d357564b127beac819e0922e56b8af3914690e63 1.1.2 -49e6c6cc8bf56523925fd8e4b1764003e5dceeb7 1.2 -3f0bd46c9051d4720f95fcfa16a2988f01457e17 1.2.1 -5d826f81a5cdf5f66808627eaecdc6932a7d0081 1.2.2 -c756ca4fdc3762fe0f63292e8637a7ca3b6bfcb3 1.2.3 -1db006246178ce9a4905443d71ff5fe9cadb2c45 1.3 -e8e07ecf2e1ba2ca0e4b88288f191cfead8f075c 1.4 -cf4a792f142df63a5a687dee46e728340af4b465 1.5 -fbce773ad6c14a46c568fd45363d006290f98c98 1.6 -f6583190c3de22ce9736e87c8f2c6d3beb6eab21 2.0b1 -081c6742b0a197297322ae5fcd4f8fa379378736 1.6.1 -55e8cb1e184885b0473643684e30ca4b559f690e 2.0 -c5273e261be34d609019db63f429bb6b34cf92ca 2.0.1 -a29b8da4ff264471adc0fd4033a3674529a210fd 2.0.2 -55831944f1c00ff5e913952ab73ccddd9242ace5 2.0.3 -01a217c7cedc645ba19776d2479a0aeceb664410 2.1b1 -5af8ebb2f2b9bda489ea0aef39c19ee9796e0e3e 2.1 -c000a249012fc302daeaea873fee3a861e31d8f5 2.1.1 -946509efadd0331365a7cbf6d6455a4752e199a2 3.0 -15e818f6a87b075e65a3e444a0e1db3ffc0890d9 3.0.1 -b2629a6ef04f4b46affb3dc3751cf3b01b145751 3.0.2 -d1266aaff8d9b4c22e4d89e65c7813658ac18de5 3.0.3 -b24852dba2e0a1b555c4129bdba217c293942656 3.0.4 -acf7b0591089a77bb2c920c8ce445bcd2a502717 3.0.5 -6d9407b6ed3579c0ebbf6f8d1d461a6cb6cdd82c 3.1b1 -0a5868df092005c73c4f999495236757371be191 3.1 -05bcc5cd7bf946f7e987c25f698de3d244013be1 3.2 -e4ce9b6392fe786bb3b56e2d724721b5d063a9d2 3.2.1 -26c53a6f5d64667ac60e15f3595214d0f89d0040 3.3 -598488b60d2148d4c44e64e9e725cde93a258c75 3.4 -05cb255d539563b0c626b24aa22cfc08f9eaa17d 3.5 -692ab5c3c197d524f99924f39b43de9a388b0d1a 3.6 -549954d7a0d716a556c331ad9d36fdbb63f7794f 3.7 -ce314407ffb017166d0bf3dec57c1e5979d916fc 3.8 -67352e4c26f1278b50c5d8914b6ecdc11f75d2a7 4.0 -5f6c010873bda9a23049f97d77515f3b9b76b4c8 4.1 -68bcccb34cc65bf48b87e7a68711ef54274efde9 4.1.1 -c3fd3cac00241f48f3982e3706c45f5da01abb13 5.0 -b2e88501a6a9bc7f1c7c230a6431ac0860ff4e50 5.1 -331d1a79f4025f029befaceb337b7612f9cf5a55 5.2 -4059d5c6c76cb43d9c79dd2f5b849a57ac33bcd5 5.2.1 -ec350f6cd8328edc404e6cbfd489b657cf7a2dea 5.3 -6d6aa6b6b030f1ea900ab59e7496e8eb105e9af3 5.4 -25fc5b1f44a2a5acf5f314f47b4df1486dae767a 5.5 -41a4a8009d2336bfebe221e735a642d0740651e6 5.5.1 -155b7078a68c14f4a8158e1154fd5c050acbcf2a 5.6 -b627f03618585eeb8df1d7403ac3637ece06d644 5.7 -a4a35ff779eb9125f2ec550e90a3a839bd8c48a9 5.7.1 -dc1cf8a793120e51c2d4b8f5a210048cb354f7f0 6.0 -dc1cf8a793120e51c2d4b8f5a210048cb354f7f0 6.0 -4f626f3936d782caba0cd63bd31df278a3528e49 6.0 -4da739a49d9e72e901111e2e4a86964a17fbf47d 6.1 -902ca64b5639519f6d0aecd786949a83944291ca 6.1.1 -63e5de418ff70bba19d758a146cf8bdf642d6e36 7.0 -8c7a0fb016a87931292c2f7ab1b735a97768759f 7.0.1 -1eed5d66e94b78aebb97d75d95559ed2e27c5447 7.0.2 -b49aea662a2ba2e30fb5288a5bfbd834be674505 7.1 -89f927d763931b78263022cca25ec85b47b6f27e 7.1.1 -8009ebf8badd5fc409a7f393209038b0057fb23e 7.1.2 -510a876a75acdb3dbd7c7db44a12004b34c8ee90 7.2 -ce25102896cdb5aeff5937bce37097b6bd960f67 7.3 -c8220affec79af112409b82a868333786f9a5e88 7.3.1 -3952633b87570a50aba6349bcc75f89f7a1db724 8.0 -fed334c57a38ea22886d311d4daf581be25b558a 8.0.1 -dbc981b43088e635228899e779747ce0eafde491 8.1 -81e61bc8edc2d6e9415005557fe216f027b5bfd6 8.1.1 -8f15c2addf681c11ce8f0437deebb338cab920d8 8.2 -d225d8ba8a020eed8170389090a5a82abc38289b 8.3 -f9004a4c72d1e41f473eef3fefa7b596b30d9259 8.4 -6ddcb034223246c4b67d9caea3f0deb18f462c59 8.4.1 -5f0cc53d698fcac4174bc54ae84b3478cb5cd06e 8.5 -e837337c9b9375a9db508a2bd4dfd0e1c3e2bcc2 8.5.1 -45a70dfe822cbdc889142e1d984a5074396ba711 8.6 -87d6d34cdea1b3b40bb60c3286b672c69ec49223 8.6.1 -d8633f6d4baf8abcffa80c456a89bf0ff09ff706 8.7 -a17bfebdf428e42ff31b71beee3e700b8329acdf 9.0 -e0adabb76d3d729c55c9211d9f5314fcce210149 9.1 -074f2c9cade6bc89372133e6d2674cfcff4b4194 9.2 -3cc50ae65bc4ceef0ce7d06f8b455d3e655396f3 9.2.1 -94e5cb8fd63b71ed9f711d3c3abeaaf9b7fd0e1d 9.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/keyring-9.3.1/.travis-osx new/keyring-10.0.2/.travis-osx --- old/keyring-9.3.1/.travis-osx 1970-01-01 01:00:00.000000000 +0100 +++ new/keyring-10.0.2/.travis-osx 2016-10-20 19:23:35.000000000 +0200 @@ -0,0 +1,5 @@ +# Perform the manual steps on osx to install python3 and activate an environment +brew update +brew install python3 +rm /usr/local/bin/python +ln -s python3 /usr/local/bin/python diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/keyring-9.3.1/.travis.yml new/keyring-10.0.2/.travis.yml --- old/keyring-9.3.1/.travis.yml 2016-07-14 16:12:11.000000000 +0200 +++ new/keyring-10.0.2/.travis.yml 2016-10-20 19:23:35.000000000 +0200 @@ -1,41 +1,37 @@ -# https://travis-ci.org/#!/jaraco/keyring -# - language: python - matrix: - include: - - os: linux - python: 2.7 - - os: linux - python: 3.2 - - os: linux - python: 3.3 - - os: linux - python: 3.4 - - os: linux - python: 3.5 - - os: osx - language: generic + include: + - os: linux + python: 2.7 + - os: linux + python: 3.3 + - os: linux + python: 3.4 + - os: linux + python: 3.5 + - os: osx + language: generic -# Perform the manual steps on osx to install python3 and activate venv before_install: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install python3; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then python3 -m venv /tmp/.env; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source /tmp/.env/bin/activate; fi +- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source .travis-osx; fi +install: +- python -m pip install tox "setuptools>=28.2" script: - - pip install -U pytest - - python setup.py test --addopts="-rs -v" - +- tox -- -rs -v +branches: + except: + - skeleton +before_deploy: +- pip install https://dl.dropboxusercontent.com/u/54081/cheeseshop/setuptools_scm-1.14.1b1.tar.gz deploy: provider: pypi + server: https://upload.pypi.org/legacy/ on: tags: true all_branches: true + python: 3.5 user: jaraco password: secure: aDqlVdm6FZ8pqLkoDRR2LH3TEz7pBvKH2HhOlSy7OEmopN/36ncql/KvfE0ccpaOES9Xm31a51bUfNjcwb1HVKjfW544C+IoSHctkG1rI5bp3q4rW+4RbQcBZVHUUKR9yQf9ZyikEmoYXi3g+JKcOf9rj+v/32PAfUDzSpFbWik= - distributions: release - python: 3.5 + distributions: dists diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/keyring-9.3.1/CHANGES.rst new/keyring-10.0.2/CHANGES.rst --- old/keyring-9.3.1/CHANGES.rst 2016-07-14 16:12:11.000000000 +0200 +++ new/keyring-10.0.2/CHANGES.rst 2016-10-20 19:23:35.000000000 +0200 @@ -1,6 +1,23 @@ CHANGES ======= +10.0.2 +----- + +* #247: Restored console script. + +10.0.1 +------ + +* Update readme to reflect test recommendations. + +10.0 +---- + +* Drop support for Python 3.2. +* Test suite now uses tox instead of pytest-runner. + Test requirements are now defined in tests/requirements.txt. + 9.3.1 ----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/keyring-9.3.1/PKG-INFO new/keyring-10.0.2/PKG-INFO --- old/keyring-9.3.1/PKG-INFO 2016-07-14 16:12:52.000000000 +0200 +++ new/keyring-10.0.2/PKG-INFO 2016-10-20 19:24:20.000000000 +0200 @@ -1,12 +1,22 @@ Metadata-Version: 1.1 Name: keyring -Version: 9.3.1 +Version: 10.0.2 Summary: Store and access your passwords safely. Home-page: https://github.com/jaraco/keyring Author: Jason R. Coombs Author-email: [email protected] License: UNKNOWN -Description: ======================================= +Description: .. image:: https://img.shields.io/pypi/v/keyring.svg + :target: https://pypi.org/project/keyring + + .. image:: https://img.shields.io/pypi/pyversions/keyring.svg + + .. image:: https://img.shields.io/pypi/dm/keyring.svg + + .. image:: https://img.shields.io/travis/jaraco/keyring/master.svg + :target: http://travis-ci.org/jaraco/keyring + + ======================================= Installing and Using Python Keyring Lib ======================================= @@ -54,7 +64,7 @@ On Linux, the recommended keyring relies on SecretStorage, which in turn relies on dbus-python, but dbus-python does not install correctly when using the Python installers, so dbus-python must be installed - as a system package. See `SecretStorage + as a system package. See `the SecretStorage GitHub repo <https://github.com/mitya57/secretstorage>`_ for details. ------------- @@ -268,14 +278,15 @@ Making Releases =============== - Python keyring lib uses a simple tag and release process. The simplified - workflow is first tag a release, then invoke ``setup.py release``. + This project makes use of automated releases via Travis-CI. The + simple workflow is to tag a commit and push it to Github. If it + passes tests on a late Python version, it will be automatically + deployed to PyPI. Other things to consider when making a release: - first ensure that tests pass (preferably on Windows and Linux) - check that the changelog is current for the intended release - - after tagging, but before releasing, push the changes to the repository Running Tests ============= @@ -283,57 +294,17 @@ Tests are `continuously run <https://travis-ci.org/#!/jaraco/keyring>`_ using Travis-CI. - |BuildStatus|_ - - .. |BuildStatus| image:: https://secure.travis-ci.org/jaraco/keyring.png - .. _BuildStatus: http://travis-ci.org/jaraco/keyring - To run the tests yourself, you'll want keyring installed to some environment - in which it can be tested. Recommended techniques are described below. - - Using pytest runner - ------------------- + in which it can be tested. Recommended technique is described below. - Keyring is instrumented with `pytest runner - <https://github.com/pytest-dev/pytest-runner>`_. Thus, you may invoke the tests - from any supported Python (with setuptools installed) using this command:: + Using tox + --------- - python setup.py test - - pytest runner will download any unmet dependencies and run the tests using - `pytest <https://bitbucket.org/hpk42/pytest>`_. + Keyring prefers use of `tox <https://pypi.org/project/tox>` to run tests. + Simply install and invoke ``tox``. This technique is the one used by the Travis-CI script. - Using virtualenv and pytest/nose/unittest - ----------------------------------------- - - Pytest and Nose are two popular test runners that will discover tests and run - them. Unittest also has a mode to discover tests. - - First, however, these test runners typically need a test environment in which - to run. It is recommended that you install keyring to a virtual environment - to avoid interfering with your system environment. For more information, see - the `venv documentation <https://docs.python.org/dev/library/venv.html>`_ or - the `virtualenv homepage <http://www.virtualenv.org>`_. - - After you've created (or designated) your environment, install keyring into - the environment by running:: - - python setup.py develop - - You then need to install the test requirements with something like:: - - pip install $( python -c "import setup, subprocess; print(subprocess.list2cmdline(setup.test_requirements))" ) - - Then, invoke your favorite test runner, e.g.:: - - py.test - - or:: - - nosetests - ---------- Background ---------- @@ -350,14 +321,12 @@ :alt: Join the chat at https://gitter.im/jaraco/keyring :target: https://gitter.im/jaraco/keyring?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge -Keywords: keyring Keychain GnomeKeyring Kwallet password storage Platform: UNKNOWN Classifier: Development Status :: 5 - Production/Stable Classifier: Intended Audience :: Developers Classifier: License :: OSI Approved :: Python Software Foundation License Classifier: License :: OSI Approved :: MIT License Classifier: Programming Language :: Python :: 2.7 -Classifier: Programming Language :: Python :: 3.2 Classifier: Programming Language :: Python :: 3.3 Classifier: Programming Language :: Python :: 3.4 Classifier: Programming Language :: Python :: 3.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/keyring-9.3.1/README.rst new/keyring-10.0.2/README.rst --- old/keyring-9.3.1/README.rst 2016-07-14 16:12:11.000000000 +0200 +++ new/keyring-10.0.2/README.rst 2016-10-20 19:23:35.000000000 +0200 @@ -1,3 +1,13 @@ +.. image:: https://img.shields.io/pypi/v/keyring.svg + :target: https://pypi.org/project/keyring + +.. image:: https://img.shields.io/pypi/pyversions/keyring.svg + +.. image:: https://img.shields.io/pypi/dm/keyring.svg + +.. image:: https://img.shields.io/travis/jaraco/keyring/master.svg + :target: http://travis-ci.org/jaraco/keyring + ======================================= Installing and Using Python Keyring Lib ======================================= @@ -46,7 +56,7 @@ On Linux, the recommended keyring relies on SecretStorage, which in turn relies on dbus-python, but dbus-python does not install correctly when using the Python installers, so dbus-python must be installed -as a system package. See `SecretStorage +as a system package. See `the SecretStorage GitHub repo <https://github.com/mitya57/secretstorage>`_ for details. ------------- @@ -260,14 +270,15 @@ Making Releases =============== -Python keyring lib uses a simple tag and release process. The simplified -workflow is first tag a release, then invoke ``setup.py release``. +This project makes use of automated releases via Travis-CI. The +simple workflow is to tag a commit and push it to Github. If it +passes tests on a late Python version, it will be automatically +deployed to PyPI. Other things to consider when making a release: - first ensure that tests pass (preferably on Windows and Linux) - check that the changelog is current for the intended release - - after tagging, but before releasing, push the changes to the repository Running Tests ============= @@ -275,57 +286,17 @@ Tests are `continuously run <https://travis-ci.org/#!/jaraco/keyring>`_ using Travis-CI. -|BuildStatus|_ - -.. |BuildStatus| image:: https://secure.travis-ci.org/jaraco/keyring.png -.. _BuildStatus: http://travis-ci.org/jaraco/keyring - To run the tests yourself, you'll want keyring installed to some environment -in which it can be tested. Recommended techniques are described below. - -Using pytest runner -------------------- +in which it can be tested. Recommended technique is described below. -Keyring is instrumented with `pytest runner -<https://github.com/pytest-dev/pytest-runner>`_. Thus, you may invoke the tests -from any supported Python (with setuptools installed) using this command:: +Using tox +--------- - python setup.py test - -pytest runner will download any unmet dependencies and run the tests using -`pytest <https://bitbucket.org/hpk42/pytest>`_. +Keyring prefers use of `tox <https://pypi.org/project/tox>` to run tests. +Simply install and invoke ``tox``. This technique is the one used by the Travis-CI script. -Using virtualenv and pytest/nose/unittest ------------------------------------------ - -Pytest and Nose are two popular test runners that will discover tests and run -them. Unittest also has a mode to discover tests. - -First, however, these test runners typically need a test environment in which -to run. It is recommended that you install keyring to a virtual environment -to avoid interfering with your system environment. For more information, see -the `venv documentation <https://docs.python.org/dev/library/venv.html>`_ or -the `virtualenv homepage <http://www.virtualenv.org>`_. - -After you've created (or designated) your environment, install keyring into -the environment by running:: - - python setup.py develop - -You then need to install the test requirements with something like:: - - pip install $( python -c "import setup, subprocess; print(subprocess.list2cmdline(setup.test_requirements))" ) - -Then, invoke your favorite test runner, e.g.:: - - py.test - -or:: - - nosetests - ---------- Background ---------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/keyring-9.3.1/docs/conf.py new/keyring-10.0.2/docs/conf.py --- old/keyring-9.3.1/docs/conf.py 2016-07-14 16:12:11.000000000 +0200 +++ new/keyring-10.0.2/docs/conf.py 2016-10-20 19:23:35.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -import setuptools_scm +import pkg_resources extensions = [ 'sphinx.ext.autodoc', @@ -10,29 +10,30 @@ # General information about the project. project = 'keyring' -copyright = '2015 Jason R. Coombs' +copyright = '2015-2016 Jason R. Coombs' # The short X.Y version. -version = setuptools_scm.get_version(root='..', relative_to=__file__) +version = pkg_resources.require(project)[0].version # The full version, including alpha/beta/rc tags. release = version master_doc = 'index' link_files = { - 'CHANGES.rst': dict( - using=dict( - GH='https://github.com', - ), - replace=[ - dict( - pattern=r"(Issue )?#(?P<issue>\d+)", - url='{GH}/jaraco/keyring/issues/{issue}', - ), - dict( - pattern=r"^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n", - with_scm="{text}\n{rev[timestamp]:%d %b %Y}\n", - ), - ], - ), + 'CHANGES.rst': dict( + using=dict( + GH='https://github.com', + project=project, + ), + replace=[ + dict( + pattern=r"(Issue )?#(?P<issue>\d+)", + url='{GH}/jaraco/{project}/issues/{issue}', + ), + dict( + pattern=r"^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n", + with_scm="{text}\n{rev[timestamp]:%d %b %Y}\n", + ), + ], + ), } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/keyring-9.3.1/docs/index.rst new/keyring-10.0.2/docs/index.rst --- old/keyring-9.3.1/docs/index.rst 2016-07-14 16:12:11.000000000 +0200 +++ new/keyring-10.0.2/docs/index.rst 2016-10-20 19:23:35.000000000 +0200 @@ -1,6 +1,5 @@ -********************************* Welcome to keyring documentation! -********************************* +================================= .. include:: ../README.rst @@ -16,9 +15,8 @@ :show-inheritance: -****************** Indices and tables -****************** +================== * :ref:`genindex` * :ref:`modindex` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/keyring-9.3.1/keyring.egg-info/PKG-INFO new/keyring-10.0.2/keyring.egg-info/PKG-INFO --- old/keyring-9.3.1/keyring.egg-info/PKG-INFO 2016-07-14 16:12:52.000000000 +0200 +++ new/keyring-10.0.2/keyring.egg-info/PKG-INFO 2016-10-20 19:24:20.000000000 +0200 @@ -1,12 +1,22 @@ Metadata-Version: 1.1 Name: keyring -Version: 9.3.1 +Version: 10.0.2 Summary: Store and access your passwords safely. Home-page: https://github.com/jaraco/keyring Author: Jason R. Coombs Author-email: [email protected] License: UNKNOWN -Description: ======================================= +Description: .. image:: https://img.shields.io/pypi/v/keyring.svg + :target: https://pypi.org/project/keyring + + .. image:: https://img.shields.io/pypi/pyversions/keyring.svg + + .. image:: https://img.shields.io/pypi/dm/keyring.svg + + .. image:: https://img.shields.io/travis/jaraco/keyring/master.svg + :target: http://travis-ci.org/jaraco/keyring + + ======================================= Installing and Using Python Keyring Lib ======================================= @@ -54,7 +64,7 @@ On Linux, the recommended keyring relies on SecretStorage, which in turn relies on dbus-python, but dbus-python does not install correctly when using the Python installers, so dbus-python must be installed - as a system package. See `SecretStorage + as a system package. See `the SecretStorage GitHub repo <https://github.com/mitya57/secretstorage>`_ for details. ------------- @@ -268,14 +278,15 @@ Making Releases =============== - Python keyring lib uses a simple tag and release process. The simplified - workflow is first tag a release, then invoke ``setup.py release``. + This project makes use of automated releases via Travis-CI. The + simple workflow is to tag a commit and push it to Github. If it + passes tests on a late Python version, it will be automatically + deployed to PyPI. Other things to consider when making a release: - first ensure that tests pass (preferably on Windows and Linux) - check that the changelog is current for the intended release - - after tagging, but before releasing, push the changes to the repository Running Tests ============= @@ -283,57 +294,17 @@ Tests are `continuously run <https://travis-ci.org/#!/jaraco/keyring>`_ using Travis-CI. - |BuildStatus|_ - - .. |BuildStatus| image:: https://secure.travis-ci.org/jaraco/keyring.png - .. _BuildStatus: http://travis-ci.org/jaraco/keyring - To run the tests yourself, you'll want keyring installed to some environment - in which it can be tested. Recommended techniques are described below. - - Using pytest runner - ------------------- + in which it can be tested. Recommended technique is described below. - Keyring is instrumented with `pytest runner - <https://github.com/pytest-dev/pytest-runner>`_. Thus, you may invoke the tests - from any supported Python (with setuptools installed) using this command:: + Using tox + --------- - python setup.py test - - pytest runner will download any unmet dependencies and run the tests using - `pytest <https://bitbucket.org/hpk42/pytest>`_. + Keyring prefers use of `tox <https://pypi.org/project/tox>` to run tests. + Simply install and invoke ``tox``. This technique is the one used by the Travis-CI script. - Using virtualenv and pytest/nose/unittest - ----------------------------------------- - - Pytest and Nose are two popular test runners that will discover tests and run - them. Unittest also has a mode to discover tests. - - First, however, these test runners typically need a test environment in which - to run. It is recommended that you install keyring to a virtual environment - to avoid interfering with your system environment. For more information, see - the `venv documentation <https://docs.python.org/dev/library/venv.html>`_ or - the `virtualenv homepage <http://www.virtualenv.org>`_. - - After you've created (or designated) your environment, install keyring into - the environment by running:: - - python setup.py develop - - You then need to install the test requirements with something like:: - - pip install $( python -c "import setup, subprocess; print(subprocess.list2cmdline(setup.test_requirements))" ) - - Then, invoke your favorite test runner, e.g.:: - - py.test - - or:: - - nosetests - ---------- Background ---------- @@ -350,14 +321,12 @@ :alt: Join the chat at https://gitter.im/jaraco/keyring :target: https://gitter.im/jaraco/keyring?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge -Keywords: keyring Keychain GnomeKeyring Kwallet password storage Platform: UNKNOWN Classifier: Development Status :: 5 - Production/Stable Classifier: Intended Audience :: Developers Classifier: License :: OSI Approved :: Python Software Foundation License Classifier: License :: OSI Approved :: MIT License Classifier: Programming Language :: Python :: 2.7 -Classifier: Programming Language :: Python :: 3.2 Classifier: Programming Language :: Python :: 3.3 Classifier: Programming Language :: Python :: 3.4 Classifier: Programming Language :: Python :: 3.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/keyring-9.3.1/keyring.egg-info/SOURCES.txt new/keyring-10.0.2/keyring.egg-info/SOURCES.txt --- old/keyring-9.3.1/keyring.egg-info/SOURCES.txt 2016-07-14 16:12:52.000000000 +0200 +++ new/keyring-10.0.2/keyring.egg-info/SOURCES.txt 2016-10-20 19:24:20.000000000 +0200 @@ -1,5 +1,5 @@ .gitignore -.hgtags +.travis-osx .travis.yml CHANGES.rst README.rst @@ -8,6 +8,7 @@ pytest.ini setup.cfg setup.py +tox.ini docs/conf.py docs/history.rst docs/index.rst @@ -26,6 +27,7 @@ keyring.egg-info/SOURCES.txt keyring.egg-info/dependency_links.txt keyring.egg-info/entry_points.txt +keyring.egg-info/namespace_packages.txt keyring.egg-info/requires.txt keyring.egg-info/top_level.txt keyring/backends/OS_X.py @@ -46,4 +48,6 @@ keyring/util/__init__.py keyring/util/escape.py keyring/util/platform_.py -keyring/util/properties.py \ No newline at end of file +keyring/util/properties.py +tests/requirements.txt +tests/test_packaging.py \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/keyring-9.3.1/keyring.egg-info/namespace_packages.txt new/keyring-10.0.2/keyring.egg-info/namespace_packages.txt --- old/keyring-9.3.1/keyring.egg-info/namespace_packages.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/keyring-10.0.2/keyring.egg-info/namespace_packages.txt 2016-10-20 19:24:20.000000000 +0200 @@ -0,0 +1 @@ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/keyring-9.3.1/keyring.egg-info/requires.txt new/keyring-10.0.2/keyring.egg-info/requires.txt --- old/keyring-9.3.1/keyring.egg-info/requires.txt 2016-07-14 16:12:52.000000000 +0200 +++ new/keyring-10.0.2/keyring.egg-info/requires.txt 2016-10-20 19:24:20.000000000 +0200 @@ -4,6 +4,3 @@ [:sys_platform=="win32"] pywin32-ctypes - -[test] -pytest>=2.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/keyring-9.3.1/pytest.ini new/keyring-10.0.2/pytest.ini --- old/keyring-9.3.1/pytest.ini 2016-07-14 16:12:11.000000000 +0200 +++ new/keyring-10.0.2/pytest.ini 2016-10-20 19:23:35.000000000 +0200 @@ -1,4 +1,4 @@ [pytest] -norecursedirs=*.egg .eggs dist build +norecursedirs=dist build .tox addopts=--doctest-modules --ignore keyring/backends/_OS_X_API.py doctest_optionflags=ALLOW_UNICODE ELLIPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/keyring-9.3.1/setup.cfg new/keyring-10.0.2/setup.cfg --- old/keyring-9.3.1/setup.cfg 2016-07-14 16:12:52.000000000 +0200 +++ new/keyring-10.0.2/setup.cfg 2016-10-20 19:24:20.000000000 +0200 @@ -1,10 +1,13 @@ [aliases] -release = clean --all sdist bdist_wheel build_sphinx upload upload_docs -test = pytest +release = dists upload +dists = clean --all sdist bdist_wheel [wheel] universal = 1 +[upload] +repository = https://upload.pypi.org/legacy/ + [egg_info] tag_build = tag_date = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/keyring-9.3.1/setup.py new/keyring-10.0.2/setup.py --- old/keyring-9.3.1/setup.py 2016-07-14 16:12:11.000000000 +0200 +++ new/keyring-10.0.2/setup.py 2016-10-20 19:23:35.000000000 +0200 @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Generated by jaraco.develop 2.27.1 -# https://pypi.python.org/pypi/jaraco.develop + +# Project skeleton maintained at https://github.com/jaraco/skeleton import io import sys @@ -10,50 +10,42 @@ with io.open('README.rst', encoding='utf-8') as readme: long_description = readme.read() -needs_pytest = {'pytest', 'test'}.intersection(sys.argv) -pytest_runner = ['pytest_runner'] if needs_pytest else [] -needs_sphinx = {'release', 'build_sphinx', 'upload_docs'}.intersection(sys.argv) -sphinx = ['sphinx', 'rst.linker'] if needs_sphinx else [] -needs_wheel = {'release', 'bdist_wheel'}.intersection(sys.argv) +needs_wheel = {'release', 'bdist_wheel', 'dists'}.intersection(sys.argv) wheel = ['wheel'] if needs_wheel else [] -test_requirements = [ - 'pytest>=2.8', -] +name = 'keyring' +description = 'Store and access your passwords safely.' setup_params = dict( - name='keyring', + name=name, use_scm_version=True, author="Kang Zhang", author_email="[email protected]", maintainer='Jason R. Coombs', maintainer_email='[email protected]', - description="Store and access your passwords safely.", + description=description or name, long_description=long_description, - url="https://github.com/jaraco/keyring";, + url="https://github.com/jaraco/"; + name, packages=setuptools.find_packages(), include_package_data=True, + namespace_packages=name.split('.')[:-1], install_requires=[ ], extras_require={ - 'test': test_requirements, ':sys_platform=="win32"': ['pywin32-ctypes'], ':sys_platform=="linux2" or sys_platform=="linux"': [ "secretstorage", ], }, setup_requires=[ - 'setuptools_scm>=1.9', - ] + pytest_runner + sphinx + wheel, - tests_require=[ - ] + test_requirements, + 'setuptools_scm>=1.9,!=1.13.1,!=1.14.0', + ] + wheel, classifiers=[ "Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", "License :: OSI Approved :: Python Software Foundation License", "License :: OSI Approved :: MIT License", "Programming Language :: Python :: 2.7", - "Programming Language :: Python :: 3.2", "Programming Language :: Python :: 3.3", "Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.5", @@ -63,7 +55,6 @@ 'keyring=keyring.cli:main', ], }, - keywords="keyring Keychain GnomeKeyring Kwallet password storage", ) if __name__ == '__main__': setuptools.setup(**setup_params) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/keyring-9.3.1/tests/requirements.txt new/keyring-10.0.2/tests/requirements.txt --- old/keyring-9.3.1/tests/requirements.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/keyring-10.0.2/tests/requirements.txt 2016-10-20 19:23:35.000000000 +0200 @@ -0,0 +1 @@ +pytest >= 2.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/keyring-9.3.1/tests/test_packaging.py new/keyring-10.0.2/tests/test_packaging.py --- old/keyring-9.3.1/tests/test_packaging.py 1970-01-01 01:00:00.000000000 +0100 +++ new/keyring-10.0.2/tests/test_packaging.py 2016-10-20 19:23:35.000000000 +0200 @@ -0,0 +1,14 @@ +import pkg_resources + +def test_entry_point(): + """ + Keyring provides exactly one 'keyring' console script + that's a callable. + """ + eps = pkg_resources.iter_entry_points('console_scripts') + ep, = ( + ep + for ep in eps + if ep.name == 'keyring' + ) + assert callable(ep.resolve()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/keyring-9.3.1/tox.ini new/keyring-10.0.2/tox.ini --- old/keyring-9.3.1/tox.ini 1970-01-01 01:00:00.000000000 +0100 +++ new/keyring-10.0.2/tox.ini 2016-10-20 19:23:35.000000000 +0200 @@ -0,0 +1,6 @@ +[testenv] +deps = + -rtests/requirements.txt + +commands = py.test {posargs} +usedevelop = True
