Update python versions, include changes from kxxoling

.editorconfig

@@ -2,12 +2,15 @@
 root = true
 
 [*]
+charset = utf-8
 indent_style = space
-indent_size = 2
+indent_size = 4
 end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
 insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{html,js,css}]
+indent_size = 2
 
-[*.md]
-trim_trailing_whitespace = false
+[Makefile]
+indent_style = tab

README.md

@@ -17,6 +17,13 @@ To install generator-python-package from npm, run:
 $ npm install -g generator-python-package
 ```
 
+Install ``kxxoling/generator-python-package``：
+
+```bash
+$ git clone https://github.com/kxxoling/generator-python-package.git
+$ cd generator-python-package && npm link
+```
+
 Finally, initiate the generator:
 
 ```bash

app/index.js

@@ -56,11 +56,13 @@ var PythonPackageGenerator = yeoman.generators.Base.extend({
     }
 
     var pythonVersions = [
-      { name: "Python 2.6", value: "2.6@py26@Python :: 2.6", checked: false },
       { name: "Python 2.7", value: "2.7@py27@Python :: 2.7", checked: true },
       { name: "Python 3.2", value: "3.2@py32@Python :: 3.2", checked: false },
       { name: "Python 3.3", value: "3.3@py33@Python :: 3.3", checked: false },
-      { name: "Python 3.4", value: "3.4@py34@Python :: 3.4", checked: true },
+      { name: "Python 3.4", value: "3.4@py34@Python :: 3.4", checked: false },
+      { name: "Python 3.5", value: "3.5@py35@Python :: 3.5", checked: true },
+      { name: "Python 3.6", value: "3.6@py36@Python :: 3.6", checked: true },
+      { name: "Python 3.7", value: "3.7@py37@Python :: 3.7", checked: true },
       { name: "PyPy", value: "pypy@pypy@Python :: Implementation :: PyPy", checked: true },
     ];
 
@@ -212,6 +214,7 @@ var PythonPackageGenerator = yeoman.generators.Base.extend({
     this.template('_tox.ini', 'tox.ini');
     this.template('_gitignore', '.gitignore');
     this.template('_travis.yml', '.travis.yml');
+    this.template('_editorconfig', '.editorconfig');
 
     if (!pkg.includePackageTests) {
       this.template('_manifest.in', 'MANIFEST.in');
@@ -224,7 +227,6 @@ var PythonPackageGenerator = yeoman.generators.Base.extend({
 
     // pkg.name/
     this.template('_root_init.py', pkg.pythonName + '/__init__.py');
-    this.template('_version.py', pkg.pythonName + '/version.py');
 
     // tests/
     this.template('_init.py', 'tests/__init__.py');

app/templates/_coveragerc

@@ -1,10 +1,3 @@
-# This file is part of <%= package.name %>.
-# <%= package.url %>
-
-# Licensed under the <%= package.license %> license:
-# http://www.opensource.org/licenses/<%= package.license%>-license
-# Copyright (c) <%= package.created.year %>, <%= package.author.name %> <<%= package.author.email %>>
-
 [run]
 omit =
     *tests.py

app/templates/_editorconfig

@@ -0,0 +1,10 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = false
+indent_style = space
+indent_size = 4
+
+[Makefile]
+indent_style = tab

app/templates/_gitignore

@@ -1,10 +1,3 @@
-# This file is part of <%= package.name %>.
-# <%= package.url %>
-
-# Licensed under the <%= package.license %> license:
-# http://www.opensource.org/licenses/<%= package.license%>-license
-# Copyright (c) <%= package.created.year %>, <%= package.author.name %> <<%= package.author.email %>>
-
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

app/templates/_init.py

@@ -1,9 +1,2 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# This file is part of <%= package.name %>.
-# <%= package.url %>
-
-# Licensed under the <%= package.license %> license:
-# http://www.opensource.org/licenses/<%= package.license%>-license
-# Copyright (c) <%= package.created.year %>, <%= package.author.name %> <<%= package.author.email %>>
+# coding: utf-8

app/templates/_makefile

@@ -1,10 +1,3 @@
-# This file is part of <%= package.name %>.
-# <%= package.url %>
-
-# Licensed under the <%= package.license %> license:
-# http://www.opensource.org/licenses/<%= package.license%>-license
-# Copyright (c) <%= package.created.year %>, <%= package.author.name %> <<%= package.author.email %>>
-
 # lists all available targets
 list:
 	@sh -c "$(MAKE) -p no_targets__ | awk -F':' '/^[a-zA-Z0-9][^\$$#\/\\t=]*:([^=]|$$)/ {split(\$$1,A,/ /);for(i in A)print A[i]}' | grep -v '__\$$' | grep -v 'make\[1\]' | grep -v 'Makefile' | sort"

app/templates/_manifest.in

@@ -1,8 +1 @@
-# This file is part of <%= package.name %>.
-# <%= package.url %>
-
-# Licensed under the <%= package.license %> license:
-# http://www.opensource.org/licenses/<%= package.license%>-license
-# Copyright (c) <%= package.created.year %>, <%= package.author.name %> <<%= package.author.email %>>
-
 recursive-exclude tests *

app/templates/_redis.conf

@@ -1,10 +1,3 @@
-# This file is part of <%= package.name %>.
-# <%= package.url %>
-
-# Licensed under the <%= package.license %> license:
-# http://www.opensource.org/licenses/<%= package.license%>-license
-# Copyright (c) <%= package.created.year %>, <%= package.author.name %> <<%= package.author.email %>>
-
 daemonize yes
 pidfile /tmp/redis_<%= package.name %>.pid
 port 4444

app/templates/_redis_tests.conf

@@ -1,10 +1,3 @@
-# This file is part of <%= package.name %>.
-# <%= package.url %>
-
-# Licensed under the <%= package.license %> license:
-# http://www.opensource.org/licenses/<%= package.license%>-license
-# Copyright (c) <%= package.created.year %>, <%= package.author.name %> <<%= package.author.email %>>
-
 daemonize yes
 pidfile /tmp/redis_<%= package.name %>_tests.pid
 port 4448

app/templates/_root_init.py

@@ -1,11 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
+# coding: utf-8
 
-# This file is part of <%= package.name %>.
-# <%= package.url %>
-
-# Licensed under the <%= package.license %> license:
-# http://www.opensource.org/licenses/<%= package.license%>-license
-# Copyright (c) <%= package.created.year %>, <%= package.author.name %> <<%= package.author.email %>>
-
-from <%= package.pythonName %>.version import __version__  # NOQA
+__version__ = '<%= package.version %>'  # NOQA

app/templates/_setup.py

@@ -1,16 +1,10 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# This file is part of <%= package.name %>.
-# <%= package.url %>
-
-# Licensed under the <%= package.license %> license:
-# http://www.opensource.org/licenses/<%= package.license%>-license
-# Copyright (c) <%= package.created.year %>, <%= package.author.name %> <<%= package.author.email %>>
-
+# coding: utf-8
 from setuptools import setup, find_packages
+
 from <%= package.pythonName %> import __version__
 
+
 tests_require = [
     'mock',
     'nose',

app/templates/_test_base.py

@@ -1,13 +1,5 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# This file is part of <%= package.name %>.
-# <%= package.url %>
-
-# Licensed under the <%= package.license %> license:
-# http://www.opensource.org/licenses/<%= package.license%>-license
-# Copyright (c) <%= package.created.year %>, <%= package.author.name %> <<%= package.author.email %>>
-
+# coding: utf-8
 from unittest import TestCase as PythonTestCase
 
 

app/templates/_test_version.py

@@ -1,13 +1,5 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# This file is part of <%= package.name %>.
-# <%= package.url %>
-
-# Licensed under the <%= package.license %> license:
-# http://www.opensource.org/licenses/<%= package.license%>-license
-# Copyright (c) <%= package.created.year %>, <%= package.author.name %> <<%= package.author.email %>>
-
+# coding: utf-8
 from preggy import expect
 
 from <%= package.pythonName %> import __version__

app/templates/_tox.ini

@@ -1,10 +1,3 @@
-# This file is part of <%= package.name %>.
-# <%= package.url %>
-
-# Licensed under the <%= package.license %> license:
-# http://www.opensource.org/licenses/<%= package.license%>-license
-# Copyright (c) <%= package.created.year %>, <%= package.author.name %> <<%= package.author.email %>>
-
 [tox]
 envlist = <%= package.pythonVersions.join(', ') %>
 

app/templates/_travis.yml

@@ -1,10 +1,3 @@
-# This file is part of <%= package.name %>.
-# <%= package.url %>
-
-# Licensed under the <%= package.license %> license:
-# http://www.opensource.org/licenses/<%= package.license%>-license
-# Copyright (c) <%= package.created.year %>, <%= package.author.name %> <<%= package.author.email %>>
-
 language: python
 
 python:<% for (var i=0; i < package.travis.length; i++) { %>