From 86f67b337b87835217995236f4523836abcc036f Mon Sep 17 00:00:00 2001 From: "Gavin M. Roy" Date: Mon, 19 Oct 2015 13:48:33 -0400 Subject: [PATCH] Cleanup for 2015 --- cookiecutter.json | 2 +- .../.gitignore | 5 +++-- .../.travis.yml | 8 +++---- .../LICENSE | 2 +- .../MANIFEST.in | 1 - .../README.rst | 21 ++++++++++--------- .../docs/api.rst | 2 +- .../docs/conf.py | 9 +------- .../docs/history.rst | 11 ++++++---- .../docs/index.rst | 20 +++++++++--------- .../setup.py | 7 ++----- .../test-requirements.txt | 2 +- 12 files changed, 41 insertions(+), 49 deletions(-) diff --git a/cookiecutter.json b/cookiecutter.json index 90ffccf..8a6e71f 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -4,5 +4,5 @@ "email": "api@aweber.com", "description": "Short description required", "git_org": "sprockets", - "year": "2014" + "year": "2015" } diff --git a/sprockets.{{cookiecutter.project_name}}/.gitignore b/sprockets.{{cookiecutter.project_name}}/.gitignore index 256332b..fbb95b3 100644 --- a/sprockets.{{cookiecutter.project_name}}/.gitignore +++ b/sprockets.{{cookiecutter.project_name}}/.gitignore @@ -46,6 +46,9 @@ coverage.xml .project .pydevproject +# PyCharm, etc +.idea + # Rope .ropeproject @@ -55,5 +58,3 @@ coverage.xml # Sphinx documentation docs/_build/ - - diff --git a/sprockets.{{cookiecutter.project_name}}/.travis.yml b/sprockets.{{cookiecutter.project_name}}/.travis.yml index 8aeec00..471ad4b 100644 --- a/sprockets.{{cookiecutter.project_name}}/.travis.yml +++ b/sprockets.{{cookiecutter.project_name}}/.travis.yml @@ -2,24 +2,22 @@ --- language: python python: - - 2.6 - 2.7 - pypy - - 3.2 - 3.3 - 3.4 + - 3.5 install: - - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2; fi - pip install -r test-requirements.txt - pip install -e . script: nosetests after_success: - - coveralls + - codecov deploy: distributions: sdist bdist_wheel provider: pypi on: - python: 2.7 + python: 3.4 tags: true all_branches: true user: sprockets diff --git a/sprockets.{{cookiecutter.project_name}}/LICENSE b/sprockets.{{cookiecutter.project_name}}/LICENSE index 6ccc982..3c72859 100644 --- a/sprockets.{{cookiecutter.project_name}}/LICENSE +++ b/sprockets.{{cookiecutter.project_name}}/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2014 AWeber Communications +Copyright (c) 2015 AWeber Communications All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/sprockets.{{cookiecutter.project_name}}/MANIFEST.in b/sprockets.{{cookiecutter.project_name}}/MANIFEST.in index 1c854ba..0561e25 100644 --- a/sprockets.{{cookiecutter.project_name}}/MANIFEST.in +++ b/sprockets.{{cookiecutter.project_name}}/MANIFEST.in @@ -2,6 +2,5 @@ include LICENSE include README.rst include *requirements.txt graft docs -graft tests.py global-exclude __pycache__ global-exclude *.pyc diff --git a/sprockets.{{cookiecutter.project_name}}/README.rst b/sprockets.{{cookiecutter.project_name}}/README.rst index daf3d3f..930458d 100644 --- a/sprockets.{{cookiecutter.project_name}}/README.rst +++ b/sprockets.{{cookiecutter.project_name}}/README.rst @@ -25,6 +25,7 @@ Requirements Example ------- This examples demonstrates how to use ``sprockets.{{ cookiecutter.project_name }}`` by ... + .. code:: python 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 -.. |Version| image:: https://badge.fury.io/py/sprockets.{{ cookiecutter.project_name }}.svg? - :target: http://badge.fury.io/py/sprockets.{{ cookiecutter.project_name }} +.. |Version| image:: https://img.shields.io/pypi/v/sprockets.{{ cookiecutter.project_name }}.svg? + :target: http://badge.fury.io/py/sprockets.{{ cookiecutter.project_name }} -.. |Status| image:: https://travis-ci.org/sprockets/sprockets.{{ cookiecutter.project_name }}.svg?branch=master - :target: https://travis-ci.org/sprockets/sprockets.{{ cookiecutter.project_name }} +.. |Status| image:: https://img.shields.io/travis/sprockets/sprockets.{{ cookiecutter.project_name }}.svg? + :target: https://travis-ci.org/sprockets/sprockets.{{ cookiecutter.project_name }} -.. |Coverage| image:: https://img.shields.io/coveralls/sprockets/sprockets.{{ cookiecutter.project_name }}.svg? - :target: https://coveralls.io/r/sprockets/sprockets.{{ cookiecutter.project_name }} +.. |Coverage| image:: https://img.shields.io/codecov/c/github/sprockets/sprockets.{{ cookiecutter.project_name }}.svg? + :target: https://codecov.io/github/sprockets/sprockets.{{ cookiecutter.project_name }}?branch=master -.. |Downloads| image:: https://pypip.in/d/sprockets.{{ cookiecutter.project_name }}/badge.svg? - :target: https://pypi.python.org/pypi/sprockets.{{ cookiecutter.project_name }} +.. |Downloads| image:: https://img.shields.io/pypi/dm/sprockets.{{ cookiecutter.project_name }}.svg? + :target: https://pypi.python.org/pypi/sprockets.{{ cookiecutter.project_name }} -.. |License| image:: https://pypip.in/license/sprockets.{{ cookiecutter.project_name }}/badge.svg? - :target: https://sprockets{{ cookiecutter.project_name.replace('.', '') }}.readthedocs.org \ No newline at end of file +.. |License| image:: https://img.shields.io/pypi/l/sprockets.{{ cookiecutter.project_name }}.svg? + :target: https://sprockets{{ cookiecutter.project_name.replace('.', '') }}.readthedocs.org diff --git a/sprockets.{{cookiecutter.project_name}}/docs/api.rst b/sprockets.{{cookiecutter.project_name}}/docs/api.rst index fe5fb86..a397648 100644 --- a/sprockets.{{cookiecutter.project_name}}/docs/api.rst +++ b/sprockets.{{cookiecutter.project_name}}/docs/api.rst @@ -1,2 +1,2 @@ .. automodule:: sprockets.{{ cookiecutter.project_name }} - :members: \ No newline at end of file + :members: diff --git a/sprockets.{{cookiecutter.project_name}}/docs/conf.py b/sprockets.{{cookiecutter.project_name}}/docs/conf.py index 9e31595..d9c89e3 100644 --- a/sprockets.{{cookiecutter.project_name}}/docs/conf.py +++ b/sprockets.{{cookiecutter.project_name}}/docs/conf.py @@ -1,6 +1,3 @@ -#!/usr/bin/env python -import sphinx_rtd_theme - from sprockets.{{cookiecutter.project_name}} import version_info, __version__ needs_sphinx = '1.0' @@ -19,11 +16,7 @@ release = __version__ if len(version_info) > 3: release += '-{0}'.format(str(v) for v in version_info[3:]) exclude_patterns = [] -pygments_style = 'sphinx' -html_theme = 'sphinx_rtd_theme' -html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] intersphinx_mapping = { - 'python': ('https://docs.python.org/', None), - 'requests': ('https://requests.readthedocs.org/en/latest/', None), + 'python': ('https://docs.python.org/3/', None), 'sprockets': ('https://sprockets.readthedocs.org/en/latest/', None), } diff --git a/sprockets.{{cookiecutter.project_name}}/docs/history.rst b/sprockets.{{cookiecutter.project_name}}/docs/history.rst index 9c6846c..b06858a 100644 --- a/sprockets.{{cookiecutter.project_name}}/docs/history.rst +++ b/sprockets.{{cookiecutter.project_name}}/docs/history.rst @@ -1,5 +1,8 @@ +.. :changelog: + Version History ---------------- -- 0.0.0 [YYYY-MM-DD] - - Change 1 - - Change 2 \ No newline at end of file +=============== + +0.0.0 (YYYY-MM-DD) +------------------ + - Initial Release diff --git a/sprockets.{{cookiecutter.project_name}}/docs/index.rst b/sprockets.{{cookiecutter.project_name}}/docs/index.rst index f9b4178..39b6ab2 100644 --- a/sprockets.{{cookiecutter.project_name}}/docs/index.rst +++ b/sprockets.{{cookiecutter.project_name}}/docs/index.rst @@ -50,17 +50,17 @@ Indices and tables * :ref:`modindex` * :ref:`search` -.. |Version| image:: https://badge.fury.io/py/sprockets.{{ cookiecutter.project_name }}.svg? - :target: http://badge.fury.io/py/sprockets.{{ cookiecutter.project_name }} +.. |Version| image:: https://img.shields.io/pypi/v/sprockets.{{ cookiecutter.project_name }}.svg? + :target: http://badge.fury.io/py/sprockets.{{ cookiecutter.project_name }} -.. |Status| image:: https://travis-ci.org/sprockets/sprockets.{{ cookiecutter.project_name }}.svg?branch=master - :target: https://travis-ci.org/sprockets/sprockets.{{ cookiecutter.project_name }} +.. |Status| image:: https://img.shields.io/travis/sprockets/sprockets.{{ cookiecutter.project_name }}.svg? + :target: https://travis-ci.org/sprockets/sprockets.{{ cookiecutter.project_name }} -.. |Coverage| image:: https://img.shields.io/coveralls/sprockets/sprockets.{{ cookiecutter.project_name }}.svg? - :target: https://coveralls.io/r/sprockets/sprockets.{{ cookiecutter.project_name }} +.. |Coverage| image:: https://img.shields.io/codecov/c/github/sprockets/sprockets.{{ cookiecutter.project_name }}.svg? + :target: https://codecov.io/github/sprockets/sprockets.{{ cookiecutter.project_name }}?branch=master -.. |Downloads| image:: https://pypip.in/d/sprockets.{{ cookiecutter.project_name }}/badge.svg? - :target: https://pypi.python.org/pypi/sprockets.{{ cookiecutter.project_name }} +.. |Downloads| image:: https://img.shields.io/pypi/dm/sprockets.{{ cookiecutter.project_name }}.svg? + :target: https://pypi.python.org/pypi/sprockets.{{ cookiecutter.project_name }} -.. |License| image:: https://pypip.in/license/sprockets.{{ cookiecutter.project_name }}/badge.svg? - :target: https://sprockets{{ cookiecutter.project_name.replace('.', '') }}.readthedocs.org +.. |License| image:: https://img.shields.io/pypi/l/sprockets.{{ cookiecutter.project_name }}.svg? + :target: https://sprockets{{ cookiecutter.project_name.replace('.', '') }}.readthedocs.org diff --git a/sprockets.{{cookiecutter.project_name}}/setup.py b/sprockets.{{cookiecutter.project_name}}/setup.py index 7e8c492..3248694 100644 --- a/sprockets.{{cookiecutter.project_name}}/setup.py +++ b/sprockets.{{cookiecutter.project_name}}/setup.py @@ -22,8 +22,6 @@ install_requires = read_requirements_file('requirements.txt') setup_requires = read_requirements_file('setup-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): tests_require.append('mock') @@ -43,12 +41,11 @@ setuptools.setup( 'Natural Language :: English', 'Operating System :: OS Independent', 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.2', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', 'Topic :: Software Development :: Libraries', @@ -57,7 +54,7 @@ setuptools.setup( packages=['sprockets', 'sprockets.{{cookiecutter.project_name.split('.')[0]}}', 'sprockets.{{cookiecutter.project_name}}'], - package_data={'': ['LICENSE', 'README.md']}, + package_data={'': ['LICENSE', 'README.rst']}, include_package_data=True, namespace_packages=['sprockets', 'sprockets.{{cookiecutter.project_name.split('.')[0]}}'], diff --git a/sprockets.{{cookiecutter.project_name}}/test-requirements.txt b/sprockets.{{cookiecutter.project_name}}/test-requirements.txt index 20b57db..429a491 100644 --- a/sprockets.{{cookiecutter.project_name}}/test-requirements.txt +++ b/sprockets.{{cookiecutter.project_name}}/test-requirements.txt @@ -1,3 +1,3 @@ coverage>=3.7,<4 -coveralls>=0.4,<1 +codecov>=1.5,<2 nose>=1.3,<2