Merge branch 'local-maintainers' of git://github.com/wking/swc-lesson-template into gh-pages

CONTRIBUTING.md

@@ -26,7 +26,7 @@ You also agree to abide by our
 4.  When editing lesson pages, you need only commit changes to the Markdown source files.
 
 5.  If you're looking for things to work on,
-    please see [the list of issues for this repository][lesson-example-issues]
+    please see [the list of issues for this repository][issues]
     or for [the template][lesson-template-issues],
     or have a look at [our actual lessons][swc-lessons].
     Comments on issues and reviews of pull requests are equally welcome.
@@ -39,15 +39,9 @@ You also agree to abide by our
 
 2.  For a list of helpful commands run `make` in this directory.
 
-3.  The [list of maintainers][swc-maintainers]
-    on the [Software Carpentry website][swc-website]
-    lists the people currently responsible for managing this repository.
-    Feel free to contact them if you have any questions or languishing pull requests.
-
 [conduct]: CONDUCT.md
+[issues]: https://github.com/swcarpentry/lesson-example/issues
 [lesson-template-issues]: https://github.com/swcarpentry/lesson-template/issues
 [license]: LICENSE.md
 [pro-git-chapter]: http://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project
 [swc-lessons]: http://software-carpentry.org/lessons.html
-[swc-maintainers]: http://software-carpentry.org/lessons.html#maintainers
-[swc-website]: http://software-carpentry.org

tools/check.py

@@ -671,7 +671,8 @@ LESSON_TEMPLATES = {"index": (IndexPageValidator, "^index"),
                     "discussion": (DiscussionPageValidator, "^discussion")}
 
 # List of files in the lesson directory that should not be validated at all
-SKIP_FILES = ("DESIGN.md", "FAQ.md", "LAYOUT.md", "README.md")
+SKIP_FILES = ("CONDUCT.md", "CONTRIBUTING.md",
+              "DESIGN.md", "FAQ.md", "LAYOUT.md", "README.md")
 
 
 def identify_template(filepath):
@@ -737,7 +738,9 @@ def validate_folder(path, template=None):
 
 def start_logging(level=logging.INFO):
     """Initialize logging and print messages to console."""
-    logging.basicConfig(stream=sys.stdout, level=level)
+    logging.basicConfig(stream=sys.stdout,
+                        level=level,
+                        format="%(levelname)s: %(message)s")
 
 
 def command_line():
@@ -763,6 +766,8 @@ def command_line():
 def check_required_files(dir_to_validate):
     """Check if required files exists."""
     REQUIRED_FILES = ["01-*.md",
+                      "CONDUCT.md",
+                      "CONTRIBUTING.md",
                       "discussion.md",
                       "index.md",
                       "instructors.md",

tools/chunk-options.R

@@ -23,4 +23,4 @@ hook_out <- function(x, options) {
 }
 
 knit_hooks$set(source = hook_in, output = hook_out, warning = hook_out,
-               error = hook_out, message = hook_out)
\ No newline at end of file
+               error = hook_out, message = hook_out)

tools/validation_helpers.py

@@ -239,4 +239,4 @@ class CommonMarkHelper(object):
         else:
             has_heading = False
 
-        return self.is_block(ast_node) and has_heading
\ No newline at end of file
+        return self.is_block(ast_node) and has_heading