Merge branch 'master' into add_markdown_tags

Author: timvink

mkdocs_git_authors_plugin/git/repo.py

@@ -136,7 +136,14 @@ def set_config(self, plugin_config):
         Args:
             - plugin_config: dictionary
         """
-        self._config = plugin_config
+        config = plugin_config.copy()
+        if config['sort_authors_by_name'] is True:
+            config['sort_authors_by'] = 'name'
+        else:
+            config['sort_authors_by'] = 'contribution'
+            
+        del config['sort_authors_by_name']
+        self._config = config
 
     def _sort_key(self, author):
         """

mkdocs_git_authors_plugin/plugin.py

@@ -10,9 +10,7 @@ class GitAuthorsPlugin(BasePlugin):
         ('show_contribution', config_options.Type(bool, default=False)),
         ('show_line_count', config_options.Type(bool, default=False)),
         ('count_empty_lines', config_options.Type(bool, default=True)),
-        ('sort_authors_by', config_options.Choice(
-            ['name', 'contribution'], default='name')
-        ),
+        ('sort_authors_by_name', config_options.Type(bool, default=True)),
         ('sort_reverse', config_options.Type(bool, default=False))
     )
 

setup.py

@@ -21,7 +21,7 @@
         "Operating System :: OS Independent",
     ],
     install_requires=[
-        'mkdocs>=1.1'
+        'mkdocs>=1.0'
     ],
     packages=find_packages(),
     entry_points={

tests/test_util.py

@@ -30,7 +30,7 @@
     'show_contribution': False, 
     'show_line_count': False, 
     'count_empty_lines': True, 
-    'sort_authors_by': 'name', 
+    'sort_authors_by_name': True, 
     'sort_reverse': False
 }
 
@@ -271,8 +271,8 @@ def test_mkdocs_in_git_subdir(tmp_path):
     """
     testproject_path = tmp_path / 'testproject'
 
-    shutil.copytree('tests/basic_setup/docs', testproject_path / 'website' / 'docs')
-    shutil.copyfile("tests/basic_setup/mkdocs.yml", testproject_path / 'website' / 'mkdocs.yml') 
+    shutil.copytree('tests/basic_setup/docs', str(testproject_path / 'website' / 'docs'))
+    shutil.copyfile("tests/basic_setup/mkdocs.yml", str(testproject_path / 'website' / 'mkdocs.yml'))
 
     cwd = os.getcwd()
     os.chdir(str(testproject_path))