Merge https://github.com/jaraco/skeleton

jaraco · Mar 28, 2019 · 9db3bba · 9db3bba
2 parents 893e00c + cdff6c8
commit 9db3bba
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/.flake8 b/.flake8
@@ -2,6 +2,8 @@
 ignore =
 	# Allow tabs for indentation
 	W191
+	# Workaround for https://github.com/PyCQA/pycodestyle/issues/836
+	E117
 	# W503 violates spec https://github.com/PyCQA/pycodestyle/issues/513
 	W503
 	# W504 has issues https://github.com/OCA/maintainer-quality-tools/issues/545

diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,4 @@
 dist: xenial
-sudo: false
 language: python
 
 python:

diff --git a/skeleton.md b/skeleton.md
@@ -10,6 +10,8 @@ It's intended to be used by a new or existing project to adopt these practices a
 
 The primary advantage to using an SCM for maintaining these techniques is that those tools help facilitate the merge between the template and its adopting projects.
 
+Another advantage to using an SCM-managed approach is that tools like GitHub recognize that a change in the skeleton is the _same change_ across all projects that merge with that skeleton. Without the ancestry, with a traditional copy/paste approach, a [commit like this](https://github.com/jaraco/skeleton/commit/12eed1326e1bc26ce256e7b3f8cd8d3a5beab2d5) would produce notifications in the upstream project issue for each and every application, but because it's centralized, GitHub provides just the one notification when the change is added to the skeleton.
+
 # Usage
 
 ## new projects
-Original file line number
+Diff line change
@@ Expand Up @@
     The primary advantage to using an SCM for maintaining these techniques is that those tools help facilitate the merge between the template and its adopting projects.
+    Another advantage to using an SCM-managed approach is that tools like GitHub recognize that a change in the skeleton is the _same change_ across all projects that merge with that skeleton. Without the ancestry, with a traditional copy/paste approach, a [commit like this](https://github.com/jaraco/skeleton/commit/12eed1326e1bc26ce256e7b3f8cd8d3a5beab2d5) would produce notifications in the upstream project issue for each and every application, but because it's centralized, GitHub provides just the one notification when the change is added to the skeleton.
     # Usage
     ## new projects
@@ Expand Down @@