Skip to content

Commit

Permalink
Merge pull request #4 from akun/develop
Browse files Browse the repository at this point in the history
using cookiecutter as project template generator
  • Loading branch information
akun committed May 10, 2014
2 parents e9b7b4d + 76087c5 commit 17ce3fc
Show file tree
Hide file tree
Showing 40 changed files with 296 additions and 435 deletions.
20 changes: 8 additions & 12 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
root = true

[*.py]
[*]
indent_style = space
indent_size = 4

[*.html]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true

[*.js]
indent_style = space
indent_size = 2
[*.py]
indent_size = 4

[*.css]
indent_style = space
[*.{html,css,js,json}]
indent_size = 2

[*.bat]
[{*.bat,Makefile}]
indent_style = tab
indent_size = 4
34 changes: 0 additions & 34 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,39 +1,5 @@
*.py[cod]
*.swp
docs/_build
include

# C extensions
*.so

# Packages
*.egg
*.egg-info
dist
build
eggs
parts
bin
var
sdist
develop-eggs
.installed.cfg
lib
lib64
__pycache__

# Installer logs
pip-log.txt

# Unit test / coverage reports
.coverage
.tox
nosetests.xml

# Translations
*.mo

# Mr Developer
.mr.developer.cfg
.project
.pydevproject
5 changes: 0 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
language: python

python:
- "3.3"
- "2.7"
- "2.6"

install:
- "pip install -r requirements.txt"
- "pip install -r requirements/test.txt"

script: make test

after_success:
- coveralls
25 changes: 2 additions & 23 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,28 +1,7 @@
SRC_DIR = aproject
DOC_DIR = docs
MAKE = make

all:
make lint
make test
make html
make clean

lint:
pylint --rcfile=.pylintrc -E $(SRC_DIR)

lintall:
pylint --rcfile=.pylintrc $(SRC_DIR)

test:
nosetests -c nose.cfg

html:
cd $(DOC_DIR) && $(MAKE) html
cookiecutter . --no-input && cd aproject && $(MAKE)

clean:
rm -rf *.egg-info
rm -rf build/*
rm -rf dist/*
rm -rf $(SRC_DIR)/*.egg-info
find $(SRC_DIR) -name "*.pyc" | xargs rm
rm -rf aproject
44 changes: 29 additions & 15 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,44 @@ aproject
:target: https://travis-ci.org/akun/aproject
:alt: Build Status

.. image:: https://landscape.io/github/akun/aproject/master/landscape.png
:target: https://landscape.io/github/akun/aproject/master
:alt: Code Health

.. image:: https://coveralls.io/repos/akun/aproject/badge.png
:target: https://coveralls.io/r/akun/aproject
:alt: Coverage Status

A Pyhton Project Template

Intro
-----

* Lint: PyLint + JSHint
* Unittest: nose + coverage
* Document: Sphinx
* CI: Travis-CI
* File Format: EditorConfig
* [o] Tools

+ [o] Lint: PyLint + JSHint + https://landscape.io
+ [o] Unittest: nose + tox
+ [o] Test Coverage: coverage + https://coveralls.io
+ [o] Document: Sphinx + https://readthedocs.org/
+ [o] CI: https://travis-ci.org/
+ [o] File Format: EditorConfig

* [o] Projects

+ [o] Python
+ [ ] Django
+ [ ] Bootstrap

Usage
-----

::

pip install cookiecutter
cookiecutter https://github.com/akun/aproject.git

Changelog
---------

0.0.3
~~~~~

2014-05-10

* using **cookiecutter** as project template generator

0.0.2
~~~~~

Expand All @@ -44,8 +60,6 @@ Changelog

* init


.. image:: https://d2weczhvl823v0.cloudfront.net/akun/aproject/trend.png
:alt: Bitdeli badge
:target: https://bitdeli.com/free

4 changes: 0 additions & 4 deletions aproject/__init__.py

This file was deleted.

5 changes: 0 additions & 5 deletions aproject/ship_it.py

This file was deleted.

13 changes: 0 additions & 13 deletions aproject/tests.py

This file was deleted.

11 changes: 11 additions & 0 deletions cookiecutter.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"full_name": "akun",
"email": "[email protected]",
"github_username": "akun",
"project_name": "aproject",
"repo_name": "aproject",
"project_short_description": "A Project Template",
"release_date": "2014-04-24",
"year": "2014",
"version": "0.0.1"
}
Loading

0 comments on commit 17ce3fc

Please sign in to comment.