[Python-modules-commits] [python-keyring] 01/01: Import python-keyring_10.0.orig.tar.gz
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Thu Oct 20 14:07:36 UTC 2016
This is an automated email from the git hooks/post-receive script.
mitya57 pushed a commit to branch upstream
in repository python-keyring.
commit f059a5ff2bb3d266c7ed7d9d2479980c108c03e1
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Thu Oct 20 17:06:11 2016 +0300
Import python-keyring_10.0.orig.tar.gz
---
.hgignore | 2 --
.hgtags | 5 +++
.travis.yml | 54 +++++++++++++++++----------------
CHANGES.rst | 36 ++++++++++++++++++++++
PKG-INFO | 52 ++++++++++++++++---------------
README.rst | 46 ++++++++++++++++------------
docs/conf.py | 37 +++++++++++-----------
docs/index.rst | 6 ++--
keyring.egg-info/PKG-INFO | 52 ++++++++++++++++---------------
keyring.egg-info/SOURCES.txt | 7 +++--
keyring.egg-info/entry_points.txt | 3 --
keyring.egg-info/namespace_packages.txt | 1 +
keyring.egg-info/requires.txt | 6 ++--
keyring/backends/SecretService.py | 3 ++
keyring/backends/kwallet.py | 3 +-
pytest.ini | 2 +-
setup.cfg | 7 +++--
setup.py | 37 +++++++++-------------
tests/requirements.txt | 1 +
tox.ini | 6 ++++
20 files changed, 212 insertions(+), 154 deletions(-)
diff --git a/.hgignore b/.hgignore
deleted file mode 100644
index 9d0b71a..0000000
--- a/.hgignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build
-dist
diff --git a/.hgtags b/.hgtags
index 654b254..061276b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -111,3 +111,8 @@ e837337c9b9375a9db508a2bd4dfd0e1c3e2bcc2 8.5.1
87d6d34cdea1b3b40bb60c3286b672c69ec49223 8.6.1
d8633f6d4baf8abcffa80c456a89bf0ff09ff706 8.7
a17bfebdf428e42ff31b71beee3e700b8329acdf 9.0
+e0adabb76d3d729c55c9211d9f5314fcce210149 9.1
+074f2c9cade6bc89372133e6d2674cfcff4b4194 9.2
+3cc50ae65bc4ceef0ce7d06f8b455d3e655396f3 9.2.1
+94e5cb8fd63b71ed9f711d3c3abeaaf9b7fd0e1d 9.3
+2dabc8d8bd343a0bfcee426efab9f0024d887271 9.3.1
diff --git a/.travis.yml b/.travis.yml
index b93ae8c..10d509a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,41 +1,43 @@
-# 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.2
+ - 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 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
+install:
+- 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 --git a/CHANGES.rst b/CHANGES.rst
index ac664b1..78cd98a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,42 @@
CHANGES
=======
+10.0
+----
+
+* Drop support for Python 3.2.
+* Test suite now uses tox instead of pytest-runner.
+
+9.3.1
+-----
+
+* Link to the new Gitter chat room is now in the
+ readme.
+* Issue #235: ``kwallet`` backend now returns
+ string objects instead of ``dbus.String`` objects,
+ for less surprising reprs.
+* Minor doc fixes.
+
+9.3
+---
+
+* Issue #161: In SecretService backend, unlock
+ individual entries.
+
+9.2.1
+-----
+
+* Issue #230: Don't rely on dbus-python and instead
+ defer to SecretStorage to describe the installation
+ requirements.
+
+9.2
+---
+
+* Issue #231 via #233: On Linux, ``secretstorage``
+ is now a declared dependency, allowing recommended
+ keyring to work simply after installation.
+
9.1
---
diff --git a/PKG-INFO b/PKG-INFO
index 9b22325..14fc487 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,22 @@
Metadata-Version: 1.1
Name: keyring
-Version: 9.1
+Version: 10.0
Summary: Store and access your passwords safely.
Home-page: https://github.com/jaraco/keyring
Author: Jason R. Coombs
Author-email: jaraco at jaraco.com
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
=======================================
@@ -41,30 +51,21 @@ Description: =======================================
Installation Instructions
-------------------------
- easy_install or pip
- ===================
+ Install from Index
+ ==================
- Run easy_install or pip::
+ Install using your favorite installer. For example:
- $ easy_install keyring
$ pip install keyring
+ Linux
+ -----
- On Linux (Ubuntu 16.04 and Fedora), keyring uses secretstorage, which
- in turn uses dbus. The following steps are likely required to enable
- the default secretstorage backend. (See below for details on Ubuntu
- 16.04 installation.)::
-
- $ sudo apt install libdbus-glib-1-dev
- $ pip install secretstorage dbus-python
-
-
- Source installation
- ===================
-
- Download the source tarball from https://pypi.python.org/pypi/keyring,
- uncompress it, and then run "setup.py install".
-
+ 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 `the SecretStorage GitHub repo
+ <https://github.com/mitya57/secretstorage>`_ for details.
-------------
Using Keyring
@@ -304,7 +305,7 @@ Description: =======================================
-------------------
Keyring is instrumented with `pytest runner
- <https://bitbucket.org/jaraco/pytest-runner>`_. Thus, you may invoke the tests
+ <https://github.com/pytest-dev/pytest-runner>`_. Thus, you may invoke the tests
from any supported Python (with setuptools installed) using this command::
python setup.py test
@@ -354,14 +355,17 @@ Description: =======================================
.. _this post: http://tarekziade.wordpress.com/2009/03/27/pycon-hallway-session-1-a-keyring-library-for-python/
.. _Google Summer of Code: http://socghop.appspot.com/
-Keywords: keyring Keychain GnomeKeyring Kwallet password storage
+
+ .. image:: https://badges.gitter.im/jaraco/keyring.svg
+ :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
+
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 --git a/README.rst b/README.rst
index e12f642..bda16f6 100644
--- a/README.rst
+++ b/README.rst
@@ -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
=======================================
@@ -33,30 +43,21 @@ package <https://pypi.python.org/pypi/keyrings.alt>`_.
Installation Instructions
-------------------------
-easy_install or pip
-===================
+Install from Index
+==================
-Run easy_install or pip::
+Install using your favorite installer. For example:
- $ easy_install keyring
$ pip install keyring
+Linux
+-----
-On Linux (Ubuntu 16.04 and Fedora), keyring uses secretstorage, which
-in turn uses dbus. The following steps are likely required to enable
-the default secretstorage backend. (See below for details on Ubuntu
-16.04 installation.)::
-
- $ sudo apt install libdbus-glib-1-dev
- $ pip install secretstorage dbus-python
-
-
-Source installation
-===================
-
-Download the source tarball from https://pypi.python.org/pypi/keyring,
-uncompress it, and then run "setup.py install".
-
+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 `the SecretStorage GitHub repo
+<https://github.com/mitya57/secretstorage>`_ for details.
-------------
Using Keyring
@@ -296,7 +297,7 @@ Using pytest runner
-------------------
Keyring is instrumented with `pytest runner
-<https://bitbucket.org/jaraco/pytest-runner>`_. Thus, you may invoke the tests
+<https://github.com/pytest-dev/pytest-runner>`_. Thus, you may invoke the tests
from any supported Python (with setuptools installed) using this command::
python setup.py test
@@ -345,3 +346,8 @@ mentored Kang on this project.
.. _this post: http://tarekziade.wordpress.com/2009/03/27/pycon-hallway-session-1-a-keyring-library-for-python/
.. _Google Summer of Code: http://socghop.appspot.com/
+
+
+.. image:: https://badges.gitter.im/jaraco/keyring.svg
+ :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
diff --git a/docs/conf.py b/docs/conf.py
index a74d115..5b425d1 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -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 @@ extensions = [
# 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 --git a/docs/index.rst b/docs/index.rst
index a943d86..2c43d6e 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,6 +1,5 @@
-*********************************
Welcome to keyring documentation!
-*********************************
+=================================
.. include:: ../README.rst
@@ -16,9 +15,8 @@ Welcome to keyring documentation!
:show-inheritance:
-******************
Indices and tables
-******************
+==================
* :ref:`genindex`
* :ref:`modindex`
diff --git a/keyring.egg-info/PKG-INFO b/keyring.egg-info/PKG-INFO
index 9b22325..14fc487 100644
--- a/keyring.egg-info/PKG-INFO
+++ b/keyring.egg-info/PKG-INFO
@@ -1,12 +1,22 @@
Metadata-Version: 1.1
Name: keyring
-Version: 9.1
+Version: 10.0
Summary: Store and access your passwords safely.
Home-page: https://github.com/jaraco/keyring
Author: Jason R. Coombs
Author-email: jaraco at jaraco.com
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
=======================================
@@ -41,30 +51,21 @@ Description: =======================================
Installation Instructions
-------------------------
- easy_install or pip
- ===================
+ Install from Index
+ ==================
- Run easy_install or pip::
+ Install using your favorite installer. For example:
- $ easy_install keyring
$ pip install keyring
+ Linux
+ -----
- On Linux (Ubuntu 16.04 and Fedora), keyring uses secretstorage, which
- in turn uses dbus. The following steps are likely required to enable
- the default secretstorage backend. (See below for details on Ubuntu
- 16.04 installation.)::
-
- $ sudo apt install libdbus-glib-1-dev
- $ pip install secretstorage dbus-python
-
-
- Source installation
- ===================
-
- Download the source tarball from https://pypi.python.org/pypi/keyring,
- uncompress it, and then run "setup.py install".
-
+ 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 `the SecretStorage GitHub repo
+ <https://github.com/mitya57/secretstorage>`_ for details.
-------------
Using Keyring
@@ -304,7 +305,7 @@ Description: =======================================
-------------------
Keyring is instrumented with `pytest runner
- <https://bitbucket.org/jaraco/pytest-runner>`_. Thus, you may invoke the tests
+ <https://github.com/pytest-dev/pytest-runner>`_. Thus, you may invoke the tests
from any supported Python (with setuptools installed) using this command::
python setup.py test
@@ -354,14 +355,17 @@ Description: =======================================
.. _this post: http://tarekziade.wordpress.com/2009/03/27/pycon-hallway-session-1-a-keyring-library-for-python/
.. _Google Summer of Code: http://socghop.appspot.com/
-Keywords: keyring Keychain GnomeKeyring Kwallet password storage
+
+ .. image:: https://badges.gitter.im/jaraco/keyring.svg
+ :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
+
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 --git a/keyring.egg-info/SOURCES.txt b/keyring.egg-info/SOURCES.txt
index b048d22..19be1ac 100644
--- a/keyring.egg-info/SOURCES.txt
+++ b/keyring.egg-info/SOURCES.txt
@@ -1,5 +1,4 @@
.gitignore
-.hgignore
.hgtags
.travis.yml
CHANGES.rst
@@ -9,6 +8,7 @@ hook-keyring.backend.py
pytest.ini
setup.cfg
setup.py
+tox.ini
docs/conf.py
docs/history.rst
docs/index.rst
@@ -26,7 +26,7 @@ keyring/py33compat.py
keyring.egg-info/PKG-INFO
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
@@ -47,4 +47,5 @@ keyring/tests/backends/test_kwallet.py
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
\ No newline at end of file
diff --git a/keyring.egg-info/entry_points.txt b/keyring.egg-info/entry_points.txt
deleted file mode 100644
index b550864..0000000
--- a/keyring.egg-info/entry_points.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-[console_scripts]
-keyring = keyring.cli:main
-
diff --git a/keyring.egg-info/namespace_packages.txt b/keyring.egg-info/namespace_packages.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/keyring.egg-info/namespace_packages.txt
@@ -0,0 +1 @@
+
diff --git a/keyring.egg-info/requires.txt b/keyring.egg-info/requires.txt
index d3386a2..61ab707 100644
--- a/keyring.egg-info/requires.txt
+++ b/keyring.egg-info/requires.txt
@@ -1,6 +1,6 @@
+[:sys_platform=="linux2" or sys_platform=="linux"]
+secretstorage
+
[:sys_platform=="win32"]
pywin32-ctypes
-
-[test]
-pytest>=2.8
diff --git a/keyring/backends/SecretService.py b/keyring/backends/SecretService.py
index 4d0328b..ca646aa 100644
--- a/keyring/backends/SecretService.py
+++ b/keyring/backends/SecretService.py
@@ -52,6 +52,9 @@ class Keyring(KeyringBackend):
items = collection.search_items(
{"username": username, "service": service})
for item in items:
+ if hasattr(item, 'unlock'):
+ if item.is_locked() and item.unlock()[0]:
+ raise InitError('failed to unlock item')
return item.get_secret().decode('utf-8')
def set_password(self, service, username, password):
diff --git a/keyring/backends/kwallet.py b/keyring/backends/kwallet.py
index 6181fbd..becf87d 100644
--- a/keyring/backends/kwallet.py
+++ b/keyring/backends/kwallet.py
@@ -82,8 +82,9 @@ class DBusKeyring(KeyringBackend):
return None
if not self.iface.hasEntry(self.handle, service, username, self.appid):
return None
- return self.iface.readPassword(
+ password = self.iface.readPassword(
self.handle, service, username, self.appid)
+ return str(password)
def set_password(self, service, username, password):
"""Set password for the username of the service
diff --git a/pytest.ini b/pytest.ini
index 1572698..cb64ee4 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -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 --git a/setup.cfg b/setup.cfg
index 850fa5c..c1794d2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -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 --git a/setup.py b/setup.py
index 2afa185..6332920 100644
--- a/setup.py
+++ b/setup.py
@@ -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,57 +10,48 @@ import setuptools
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="jobo.zh at gmail.com",
maintainer='Jason R. Coombs',
maintainer_email='jaraco at jaraco.com',
- 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",
],
entry_points={
- 'console_scripts': [
- 'keyring=keyring.cli:main',
- ],
},
- keywords="keyring Keychain GnomeKeyring Kwallet password storage",
)
if __name__ == '__main__':
setuptools.setup(**setup_params)
diff --git a/tests/requirements.txt b/tests/requirements.txt
new file mode 100644
index 0000000..70bc02f
--- /dev/null
+++ b/tests/requirements.txt
@@ -0,0 +1 @@
+pytest >= 2.8
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..d740130
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,6 @@
+[testenv]
+deps =
+ -rtests/requirements.txt
+
+commands = py.test {posargs}
+usedevelop = True
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-keyring.git
More information about the Python-modules-commits
mailing list