[Python-modules-commits] [keyrings.alt] 01/03: Import keyrings.alt_1.2.orig.tar.gz
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Tue Dec 13 11:31:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
mitya57 pushed a commit to branch master
in repository keyrings.alt.
commit b1234f31864f08c6a8cf5f1e400ccdb8e9139de2
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Tue Dec 13 14:27:00 2016 +0300
Import keyrings.alt_1.2.orig.tar.gz
---
.gitignore | 6 ------
.hgtags | 4 ----
.travis.yml | 23 +++++++++++++++++----
CHANGES.rst | 8 ++++++++
LICENSE | 21 +++++++++++++++++++
PKG-INFO | 23 ++++++++++++++++++---
README.rst | 21 +++++++++++++++++--
docs/conf.py | 24 ++++++++++++++++++++--
docs/history.rst | 2 +-
docs/requirements.txt | 1 +
keyrings.alt.egg-info/PKG-INFO | 23 ++++++++++++++++++---
keyrings.alt.egg-info/SOURCES.txt | 6 ++++--
pytest.ini | 2 +-
setup.cfg | 9 +++++---
setup.py | 43 ++++++++++-----------------------------
tests/requirements.txt | 15 ++++++++++++++
tests/test_crypto.py | 2 +-
tox.ini | 6 ++++++
18 files changed, 175 insertions(+), 64 deletions(-)
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index f9c1e1d..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-dist/
-build/
-.eggs/
-*.pyc
-*.egg-info/
-.cache/
diff --git a/.hgtags b/.hgtags
deleted file mode 100644
index d67a6f5..0000000
--- a/.hgtags
+++ /dev/null
@@ -1,4 +0,0 @@
-b3173ad03e2b87d50ab31eecc5e6e57e9963785d 1.0
-f9defd8cbdfabaeb1739fd02929f272ba7e4be73 1.0.1
-acdefb2c6c473bf6460004dbbe1f62280fcdeac8 1.1
-43b2bf00ab0477d3734932feb05ce6d533df255a 1.1.1
diff --git a/.travis.yml b/.travis.yml
index 6e5e969..e2e715f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,23 @@
sudo: false
language: python
python:
- - 2.7
- - 3.5
+- 2.7
+- 3.5
+install:
+- pip install tox "setuptools>=28.2"
script:
- - pip install -U pytest
- - python setup.py test
+- tox
+branches:
+ except:
+ - skeleton
+deploy:
+ provider: pypi
+ server: https://upload.pypi.org/legacy/
+ on:
+ tags: true
+ all_branches: true
+ python: 3.5
+ user: jaraco
+ distributions: dists
+ password:
+ secure: iRtbY9yEN8qwJ7wiycL8N5NdZhRDENT5M8Bkpm7YSN5OiM41LRwFYnHDoQhYpz9L/UdfbovgEvv1XsQX/o8XRTn5efmhXRgS/FY3cA7Ry0GG41hmk2fnAgYuivA8EGoPveS9CnbU71ikL0HjRHv93+7Pz1kyMEYXRUpbMZ16K74o1J1MLOoCdQXXlKWfYjqAV/BglWwjIkwXVmNM2JwGV7U2hJ8zjsX1Bn7XqsZdC2KB6jK1frVjEHDfbv3NLQYIzQYqGw8GMWa+9EGVfFzqPnQmUC3E5GA93rC1SceBUb2RDBfCUpyFkyin3lQ05EvyVJoIaZO56gJ9Py1XzzSinSTjylgTxvFWx4uweowv5oM9OWnV+3SsZDw5+55fW5CYiMjdqjLso83gTkc8jbDHeK73Yh0sju2+QnOejnMzKRaBtCBubUkL+TPjEzoeUYSKLgW+iVHIKNKEKNME/WLzNtEhQwEFbLD5 [...]
diff --git a/CHANGES.rst b/CHANGES.rst
index e224b85..7beaf00 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,11 @@
+1.2
+===
+
+Updated project skeleton. Tests now run under tox. Tagged
+commits are automatically released to PyPI.
+
+#6: Added license file.
+
1.1.1
=====
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..df771eb
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015-2016 Jason R. Coombs <jaraco at jaraco.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/PKG-INFO b/PKG-INFO
index b397cee..9a55837 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,17 +1,34 @@
Metadata-Version: 1.1
Name: keyrings.alt
-Version: 1.1.1
+Version: 1.2
Summary: Alternate keyring implementations
Home-page: https://github.com/jaraco/keyrings.alt
Author: Jason R. Coombs
Author-email: jaraco at jaraco.com
License: UNKNOWN
-Description: keyrings.alt
- ============
+Description: .. image:: https://img.shields.io/pypi/v/keyrings.alt.svg
+ :target: https://pypi.org/project/keyrings.alt
+
+ .. image:: https://img.shields.io/pypi/pyversions/keyrings.alt.svg
+
+ .. image:: https://img.shields.io/pypi/dm/keyrings.alt.svg
+
+ .. image:: https://img.shields.io/travis/jaraco/keyrings.alt/master.svg
+ :target: http://travis-ci.org/jaraco/keyrings.alt
Alternate keyring backend implementations for use with the
`keyring package <https://pypi.python.org/pypi/keyring>`_.
+ Docs
+ ====
+
+ There's `no good mechanism for publishing documentation
+ <https://github.com/pypa/python-packaging-user-guide/pull/266>`_
+ easily. If there's a documentation link above, it's probably
+ stale because PyPI-based documentation is deprecated. This
+ project may have documentation published at ReadTheDocs, but
+ probably not. Good luck finding it.
+
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Intended Audience :: Developers
diff --git a/README.rst b/README.rst
index 83a0c9f..6fb3ff5 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,22 @@
-keyrings.alt
-============
+.. image:: https://img.shields.io/pypi/v/keyrings.alt.svg
+ :target: https://pypi.org/project/keyrings.alt
+
+.. image:: https://img.shields.io/pypi/pyversions/keyrings.alt.svg
+
+.. image:: https://img.shields.io/pypi/dm/keyrings.alt.svg
+
+.. image:: https://img.shields.io/travis/jaraco/keyrings.alt/master.svg
+ :target: http://travis-ci.org/jaraco/keyrings.alt
Alternate keyring backend implementations for use with the
`keyring package <https://pypi.python.org/pypi/keyring>`_.
+
+Docs
+====
+
+There's `no good mechanism for publishing documentation
+<https://github.com/pypa/python-packaging-user-guide/pull/266>`_
+easily. If there's a documentation link above, it's probably
+stale because PyPI-based documentation is deprecated. This
+project may have documentation published at ReadTheDocs, but
+probably not. Good luck finding it.
diff --git a/docs/conf.py b/docs/conf.py
index 7a15d08..f69e839 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,10 +1,11 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
-import setuptools_scm
+import pkg_resources
extensions = [
'sphinx.ext.autodoc',
+ 'rst.linker',
]
# General information about the project.
@@ -12,8 +13,27 @@ project = 'keyrings.alt'
copyright = '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',
+ 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/history.rst b/docs/history.rst
index 907000b..8e21750 100644
--- a/docs/history.rst
+++ b/docs/history.rst
@@ -5,4 +5,4 @@
History
*******
-.. include:: ../CHANGES.rst
+.. include:: ../CHANGES (links).rst
diff --git a/docs/requirements.txt b/docs/requirements.txt
new file mode 100644
index 0000000..442df9f
--- /dev/null
+++ b/docs/requirements.txt
@@ -0,0 +1 @@
+rst.linker
diff --git a/keyrings.alt.egg-info/PKG-INFO b/keyrings.alt.egg-info/PKG-INFO
index b397cee..9a55837 100644
--- a/keyrings.alt.egg-info/PKG-INFO
+++ b/keyrings.alt.egg-info/PKG-INFO
@@ -1,17 +1,34 @@
Metadata-Version: 1.1
Name: keyrings.alt
-Version: 1.1.1
+Version: 1.2
Summary: Alternate keyring implementations
Home-page: https://github.com/jaraco/keyrings.alt
Author: Jason R. Coombs
Author-email: jaraco at jaraco.com
License: UNKNOWN
-Description: keyrings.alt
- ============
+Description: .. image:: https://img.shields.io/pypi/v/keyrings.alt.svg
+ :target: https://pypi.org/project/keyrings.alt
+
+ .. image:: https://img.shields.io/pypi/pyversions/keyrings.alt.svg
+
+ .. image:: https://img.shields.io/pypi/dm/keyrings.alt.svg
+
+ .. image:: https://img.shields.io/travis/jaraco/keyrings.alt/master.svg
+ :target: http://travis-ci.org/jaraco/keyrings.alt
Alternate keyring backend implementations for use with the
`keyring package <https://pypi.python.org/pypi/keyring>`_.
+ Docs
+ ====
+
+ There's `no good mechanism for publishing documentation
+ <https://github.com/pypa/python-packaging-user-guide/pull/266>`_
+ easily. If there's a documentation link above, it's probably
+ stale because PyPI-based documentation is deprecated. This
+ project may have documentation published at ReadTheDocs, but
+ probably not. Good luck finding it.
+
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Intended Audience :: Developers
diff --git a/keyrings.alt.egg-info/SOURCES.txt b/keyrings.alt.egg-info/SOURCES.txt
index 96b57bb..cfaa397 100644
--- a/keyrings.alt.egg-info/SOURCES.txt
+++ b/keyrings.alt.egg-info/SOURCES.txt
@@ -1,15 +1,16 @@
-.gitignore
-.hgtags
.travis.yml
CHANGES.rst
+LICENSE
README.rst
conftest.py
pytest.ini
setup.cfg
setup.py
+tox.ini
docs/conf.py
docs/history.rst
docs/index.rst
+docs/requirements.txt
keyrings/__init__.py
keyrings.alt.egg-info/PKG-INFO
keyrings.alt.egg-info/SOURCES.txt
@@ -29,6 +30,7 @@ keyrings/alt/multi.py
keyrings/alt/pyfs.py
tests/__init__.py
tests/mocks.py
+tests/requirements.txt
tests/test_Gnome.py
tests/test_Google.py
tests/test_Windows.py
diff --git a/pytest.ini b/pytest.ini
index 9752c36..56a8774 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,4 +1,4 @@
[pytest]
-norecursedirs=*.egg .eggs dist build
+norecursedirs=dist build .tox
addopts=--doctest-modules
doctest_optionflags=ALLOW_UNICODE ELLIPSIS
diff --git a/setup.cfg b/setup.cfg
index a880e96..c1794d2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,12 +1,15 @@
[aliases]
-release = 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_svn_revision = 0
tag_build =
tag_date = 0
+tag_svn_revision = 0
diff --git a/setup.py b/setup.py
index ecb810b..90f447a 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,51 +10,30 @@ 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'] 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 = [
- 'gdata',
- 'python-keyczar',
- 'fs>=0.5',
- 'pycrypto',
-]
-"dependencies for running tests"
-
-if sys.version_info >= (3, 0):
- # gdata doesn't currently install on Python 3. Omit it also.
- # http://code.google.com/p/gdata-python-client/issues/detail?id=229
- test_requirements.remove('gdata')
-
- # keyczar doesn't currently install on Python 3. Omit it also.
- # http://code.google.com/p/keyczar/issues/detail?id=125
- test_requirements.remove('python-keyczar')
+name = 'keyrings.alt'
+description = 'Alternate keyring implementations'
setup_params = dict(
- name='keyrings.alt',
+ name=name,
use_scm_version=True,
author="Jason R. Coombs",
author_email="jaraco at jaraco.com",
- description="Alternate keyring implementations",
+ description=description or name,
long_description=long_description,
- url="https://github.com/jaraco/keyrings.alt",
+ url="https://github.com/jaraco/" + name,
packages=setuptools.find_packages(exclude=['tests']),
include_package_data=True,
- namespace_packages=['keyrings'],
+ namespace_packages=name.split('.')[:-1],
install_requires=[
],
extras_require={
},
setup_requires=[
- 'setuptools_scm>=1.9',
- ] + pytest_runner + sphinx + wheel,
- tests_require=[
- 'keyring[test]',
- ] + test_requirements,
+ 'setuptools_scm>=1.15.0',
+ ] + wheel,
classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
diff --git a/tests/requirements.txt b/tests/requirements.txt
new file mode 100644
index 0000000..e84f9c9
--- /dev/null
+++ b/tests/requirements.txt
@@ -0,0 +1,15 @@
+pytest >= 2.8
+backports.unittest_mock
+keyring[test]
+
+fs>=0.5
+pycrypto
+
+# gdata doesn't currently install on Python 3
+# http://code.google.com/p/gdata-python-client/issues/detail?id=229
+gdata; python_version=="2.7"
+
+
+# keyczar doesn't currently install on Python 3.
+# http://code.google.com/p/keyczar/issues/detail?id=125
+python-keyczar; python_version=="2.7"
diff --git a/tests/test_crypto.py b/tests/test_crypto.py
index 04dfae0..2f8571b 100644
--- a/tests/test_crypto.py
+++ b/tests/test_crypto.py
@@ -1,5 +1,5 @@
import unittest
-import mock
+from unittest import mock
from .test_file import FileKeyringTests
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/keyrings.alt.git
More information about the Python-modules-commits
mailing list