Merge pull request #52 from timgates42/feature/latest_cookiecutter_up…

…dat_61 Latest cookiecutter updates
3amigos-dev · Aug 23, 2019 · c7a11dd · c7a11dd
2 parents 9312a3e + e626840
commit c7a11dd
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 3 deletions.
diff --git a/app/.isort.cfg b/app/.isort.cfg
@@ -1,2 +1,3 @@
 [isort]
+not_skip = __init__.py
 line_length = 88
diff --git a/app/.pylintrc b/app/.pylintrc
@@ -54,7 +54,7 @@ confidence=
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use"--disable=all --enable=classes
 # --disable=W"
-disable=useless-object-inheritance
+disable=useless-object-inheritance,bad-continuation
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option

diff --git a/app/setup.cfg b/app/setup.cfg
@@ -0,0 +1,3 @@
+[isort]
+not_skip = __init__.py
+line_length = 88
diff --git a/cookiecutter.json b/cookiecutter.json
@@ -42,5 +42,6 @@
     "license": [
         "GPLv3+",
         "MIT"
-    ]
+    ],
+    "entry_points": ""
 }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -59,6 +59,8 @@ services:
       - TRAVIS_TIMER_START_TIME
       - TRAVIS_TMPDIR
       - TRAVIS_UID
+      - USER
+      - USERNAME
     volumes:
       - type: bind
         source: .

diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt
@@ -24,7 +24,6 @@ conftest
 contrib
 cookiecutter
 CookieCutter
-module_goes_here
 cov
 css
 datetime
@@ -39,6 +38,7 @@ DOCTYPE
 docutils
 exename
 genindex
+GitPython
 GPLv
 hh
 hostname
@@ -63,6 +63,7 @@ newplaceid
 noqa
 nosec
 pademelon
+pademelon
 parallelization
 param
 params
@@ -126,3 +127,4 @@ webgui
 xdist
 xml
 yyyy
+module_goes_here