Merge pull request #5 from sprockets/minor-cleanup

Cleanup for 2015
This commit is contained in:
dave-shawley 2015-10-28 13:50:57 -04:00
commit 4e2613d458
12 changed files with 41 additions and 49 deletions

View file

@ -4,5 +4,5 @@
"email": "api@aweber.com", "email": "api@aweber.com",
"description": "Short description required", "description": "Short description required",
"git_org": "sprockets", "git_org": "sprockets",
"year": "2014" "year": "2015"
} }

View file

@ -46,6 +46,9 @@ coverage.xml
.project .project
.pydevproject .pydevproject
# PyCharm, etc
.idea
# Rope # Rope
.ropeproject .ropeproject
@ -55,5 +58,3 @@ coverage.xml
# Sphinx documentation # Sphinx documentation
docs/_build/ docs/_build/

View file

@ -2,24 +2,22 @@
--- ---
language: python language: python
python: python:
- 2.6
- 2.7 - 2.7
- pypy - pypy
- 3.2
- 3.3 - 3.3
- 3.4 - 3.4
- 3.5
install: install:
- if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2; fi
- pip install -r test-requirements.txt - pip install -r test-requirements.txt
- pip install -e . - pip install -e .
script: nosetests script: nosetests
after_success: after_success:
- coveralls - codecov
deploy: deploy:
distributions: sdist bdist_wheel distributions: sdist bdist_wheel
provider: pypi provider: pypi
on: on:
python: 2.7 python: 3.4
tags: true tags: true
all_branches: true all_branches: true
user: sprockets user: sprockets

View file

@ -1,4 +1,4 @@
Copyright (c) 2014 AWeber Communications Copyright (c) 2015 AWeber Communications
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,

View file

@ -2,6 +2,5 @@ include LICENSE
include README.rst include README.rst
include *requirements.txt include *requirements.txt
graft docs graft docs
graft tests.py
global-exclude __pycache__ global-exclude __pycache__
global-exclude *.pyc global-exclude *.pyc

View file

@ -25,6 +25,7 @@ Requirements
Example Example
------- -------
This examples demonstrates how to use ``sprockets.{{ cookiecutter.project_name }}`` by ... This examples demonstrates how to use ``sprockets.{{ cookiecutter.project_name }}`` by ...
.. code:: python .. code:: python
from sprockets import {{ cookiecutter.project_name }} from sprockets import {{ cookiecutter.project_name }}
@ -35,17 +36,17 @@ Version History
--------------- ---------------
Available at https://sprockets{{ cookiecutter.project_name.replace('.', '') }}.readthedocs.org/en/latest/history.html Available at https://sprockets{{ cookiecutter.project_name.replace('.', '') }}.readthedocs.org/en/latest/history.html
.. |Version| image:: https://badge.fury.io/py/sprockets.{{ cookiecutter.project_name }}.svg? .. |Version| image:: https://img.shields.io/pypi/v/sprockets.{{ cookiecutter.project_name }}.svg?
:target: http://badge.fury.io/py/sprockets.{{ cookiecutter.project_name }} :target: http://badge.fury.io/py/sprockets.{{ cookiecutter.project_name }}
.. |Status| image:: https://travis-ci.org/sprockets/sprockets.{{ cookiecutter.project_name }}.svg?branch=master .. |Status| image:: https://img.shields.io/travis/sprockets/sprockets.{{ cookiecutter.project_name }}.svg?
:target: https://travis-ci.org/sprockets/sprockets.{{ cookiecutter.project_name }} :target: https://travis-ci.org/sprockets/sprockets.{{ cookiecutter.project_name }}
.. |Coverage| image:: https://img.shields.io/coveralls/sprockets/sprockets.{{ cookiecutter.project_name }}.svg? .. |Coverage| image:: https://img.shields.io/codecov/c/github/sprockets/sprockets.{{ cookiecutter.project_name }}.svg?
:target: https://coveralls.io/r/sprockets/sprockets.{{ cookiecutter.project_name }} :target: https://codecov.io/github/sprockets/sprockets.{{ cookiecutter.project_name }}?branch=master
.. |Downloads| image:: https://pypip.in/d/sprockets.{{ cookiecutter.project_name }}/badge.svg? .. |Downloads| image:: https://img.shields.io/pypi/dm/sprockets.{{ cookiecutter.project_name }}.svg?
:target: https://pypi.python.org/pypi/sprockets.{{ cookiecutter.project_name }} :target: https://pypi.python.org/pypi/sprockets.{{ cookiecutter.project_name }}
.. |License| image:: https://pypip.in/license/sprockets.{{ cookiecutter.project_name }}/badge.svg? .. |License| image:: https://img.shields.io/pypi/l/sprockets.{{ cookiecutter.project_name }}.svg?
:target: https://sprockets{{ cookiecutter.project_name.replace('.', '') }}.readthedocs.org :target: https://sprockets{{ cookiecutter.project_name.replace('.', '') }}.readthedocs.org

View file

@ -1,2 +1,2 @@
.. automodule:: sprockets.{{ cookiecutter.project_name }} .. automodule:: sprockets.{{ cookiecutter.project_name }}
:members: :members:

View file

@ -1,6 +1,3 @@
#!/usr/bin/env python
import sphinx_rtd_theme
from sprockets.{{cookiecutter.project_name}} import version_info, __version__ from sprockets.{{cookiecutter.project_name}} import version_info, __version__
needs_sphinx = '1.0' needs_sphinx = '1.0'
@ -19,11 +16,7 @@ release = __version__
if len(version_info) > 3: if len(version_info) > 3:
release += '-{0}'.format(str(v) for v in version_info[3:]) release += '-{0}'.format(str(v) for v in version_info[3:])
exclude_patterns = [] exclude_patterns = []
pygments_style = 'sphinx'
html_theme = 'sphinx_rtd_theme'
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
intersphinx_mapping = { intersphinx_mapping = {
'python': ('https://docs.python.org/', None), 'python': ('https://docs.python.org/3/', None),
'requests': ('https://requests.readthedocs.org/en/latest/', None),
'sprockets': ('https://sprockets.readthedocs.org/en/latest/', None), 'sprockets': ('https://sprockets.readthedocs.org/en/latest/', None),
} }

View file

@ -1,5 +1,8 @@
.. :changelog:
Version History Version History
--------------- ===============
- 0.0.0 [YYYY-MM-DD]
- Change 1 0.0.0 (YYYY-MM-DD)
- Change 2 ------------------
- Initial Release

View file

@ -50,17 +50,17 @@ Indices and tables
* :ref:`modindex` * :ref:`modindex`
* :ref:`search` * :ref:`search`
.. |Version| image:: https://badge.fury.io/py/sprockets.{{ cookiecutter.project_name }}.svg? .. |Version| image:: https://img.shields.io/pypi/v/sprockets.{{ cookiecutter.project_name }}.svg?
:target: http://badge.fury.io/py/sprockets.{{ cookiecutter.project_name }} :target: http://badge.fury.io/py/sprockets.{{ cookiecutter.project_name }}
.. |Status| image:: https://travis-ci.org/sprockets/sprockets.{{ cookiecutter.project_name }}.svg?branch=master .. |Status| image:: https://img.shields.io/travis/sprockets/sprockets.{{ cookiecutter.project_name }}.svg?
:target: https://travis-ci.org/sprockets/sprockets.{{ cookiecutter.project_name }} :target: https://travis-ci.org/sprockets/sprockets.{{ cookiecutter.project_name }}
.. |Coverage| image:: https://img.shields.io/coveralls/sprockets/sprockets.{{ cookiecutter.project_name }}.svg? .. |Coverage| image:: https://img.shields.io/codecov/c/github/sprockets/sprockets.{{ cookiecutter.project_name }}.svg?
:target: https://coveralls.io/r/sprockets/sprockets.{{ cookiecutter.project_name }} :target: https://codecov.io/github/sprockets/sprockets.{{ cookiecutter.project_name }}?branch=master
.. |Downloads| image:: https://pypip.in/d/sprockets.{{ cookiecutter.project_name }}/badge.svg? .. |Downloads| image:: https://img.shields.io/pypi/dm/sprockets.{{ cookiecutter.project_name }}.svg?
:target: https://pypi.python.org/pypi/sprockets.{{ cookiecutter.project_name }} :target: https://pypi.python.org/pypi/sprockets.{{ cookiecutter.project_name }}
.. |License| image:: https://pypip.in/license/sprockets.{{ cookiecutter.project_name }}/badge.svg? .. |License| image:: https://img.shields.io/pypi/l/sprockets.{{ cookiecutter.project_name }}.svg?
:target: https://sprockets{{ cookiecutter.project_name.replace('.', '') }}.readthedocs.org :target: https://sprockets{{ cookiecutter.project_name.replace('.', '') }}.readthedocs.org

View file

@ -22,8 +22,6 @@ install_requires = read_requirements_file('requirements.txt')
setup_requires = read_requirements_file('setup-requirements.txt') setup_requires = read_requirements_file('setup-requirements.txt')
tests_require = read_requirements_file('test-requirements.txt') tests_require = read_requirements_file('test-requirements.txt')
if sys.version_info < (2, 7):
tests_require.append('unittest2')
if sys.version_info < (3, 0): if sys.version_info < (3, 0):
tests_require.append('mock') tests_require.append('mock')
@ -43,12 +41,11 @@ setuptools.setup(
'Natural Language :: English', 'Natural Language :: English',
'Operating System :: OS Independent', 'Operating System :: OS Independent',
'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.2',
'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy', 'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Software Development :: Libraries', 'Topic :: Software Development :: Libraries',
@ -57,7 +54,7 @@ setuptools.setup(
packages=['sprockets', packages=['sprockets',
'sprockets.{{cookiecutter.project_name.split('.')[0]}}', 'sprockets.{{cookiecutter.project_name.split('.')[0]}}',
'sprockets.{{cookiecutter.project_name}}'], 'sprockets.{{cookiecutter.project_name}}'],
package_data={'': ['LICENSE', 'README.md']}, package_data={'': ['LICENSE', 'README.rst']},
include_package_data=True, include_package_data=True,
namespace_packages=['sprockets', namespace_packages=['sprockets',
'sprockets.{{cookiecutter.project_name.split('.')[0]}}'], 'sprockets.{{cookiecutter.project_name.split('.')[0]}}'],

View file

@ -1,3 +1,3 @@
coverage>=3.7,<4 coverage>=3.7,<4
coveralls>=0.4,<1 codecov>=1.5,<2
nose>=1.3,<2 nose>=1.3,<2