Commit d6655d44 authored by Raniere Silva's avatar Raniere Silva
Browse files

Merge tag 'v9.5.0' into gh-pages 

v9.5.0

New Features

- Migrate `bin/*.py` to Python 3

  Because Python 2 will not be supported soon
  and we are teaching Python 3 for a while.
- Add note about the version of the style

  This will help maintainers, contributors and users.
- Move boilerplate files to their own file

  This will help maintainers to copy some files.
- Add `.travis.yml`

  This will help contributors to know what is wrong.

Changes

- Fix favicon
- Fix search (powered by Google)
- Clean footer HTML
- Fix Copyright information
- Fix line wrap after dash in code block
- Fix font size of h2 in call out box
- Remove root and layout from YAML for boilerplate
- Make Jekyll ignore .Rproj

Contributors

- Andy Boughton (@abought)
- François Michonneau (@fmichonneau)
- Joseph Stachelek (@jsta)
- Katrin Leinweber (@katrinleinweber)
- Maxim Belkin (@maxim-belkin)
- Michael R. Crusoe (@mr-c)
parents 1cbe7072 2a7326fb

_includes/lesson_footer.html

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
  <div class="row">

    <div class="col-md-12" align="center">

      Using <a href="https://github.com/swcarpentry/styles/">The Carpentries style</a> 

      version <a href="https://github.com/swcarpentry/styles/releases/tag/v9.4.0">9.4.0</a>.

      version <a href="https://github.com/swcarpentry/styles/releases/tag/v9.5.0">9.5.0</a>.

    </div>

  </div>

</footer>

bin/lesson_check.py

+8 −3
Original line number Diff line number Diff line
@@ -175,9 +175,14 @@ def check_config(reporter, source_dir): 
    reporter.check_field(config_file, 'configuration', config, 'title')

    reporter.check_field(config_file, 'configuration', config, 'email')



    reporter.check({'values': {'root': '..'}} in config.get('defaults', []),

    for defaults in [

            {'values': {'root': '.', 'layout': 'page'}},

            {'values': {'root': '..', 'layout': 'episode'}, 'scope': {'type': 'episodes', 'path': ''}},

            {'values': {'root': '..', 'layout': 'page'}, 'scope': {'type': 'extras', 'path': ''}}

            ]:

        reporter.check(defaults in config.get('defaults', []),

                   'configuration',

                   '"root" not set to ".." in configuration')

                   '"root" not set to "." in configuration')





def read_references(reporter, ref_path):
@@ -508,7 +513,6 @@ class CheckGeneric(CheckBase): 


    def __init__(self, args, filename, metadata, metadata_len, text, lines, doc):

        super().__init__(args, filename, metadata, metadata_len, text, lines, doc)

        self.layout = 'page'





CHECKERS = [
@@ -517,6 +521,7 @@ CHECKERS = [ 
    (re.compile(r'index\.md'), CheckIndex),

    (re.compile(r'reference\.md'), CheckReference),

    (re.compile(r'_episodes/.*\.md'), CheckEpisode),

    (re.compile(r'aio\.md'), CheckNonJekyll),

    (re.compile(r'.*\.md'), CheckGeneric)

]