Merge pull request #281 from pimutils/yapf

Reformat using yapf, and add it to CI

Author: Hugo Osvaldo Barrera

docs/source/conf.py

@@ -30,7 +30,7 @@
     None,
     configspec=specpath,
     stringify=False,
-    list_values=False
+    list_values=False,
 )
 validator = validate.Validator()
 config.validate(validator)
@@ -52,7 +52,9 @@ def write_section(section, secname, key, comment, file_):
         fun_args = []
     if fun_name == 'integer' and len(fun_args) == 2:
         fun_name += ', allowed values are between {} and {}'.format(
-            fun_args[0], fun_args[1])
+            fun_args[0],
+            fun_args[1],
+        )
         fun_args = []
     file_.write('\n')
     if fun_name in ['expand_db_path', 'expand_path']:
@@ -89,8 +91,13 @@ def write_section(section, secname, key, comment, file_):
                 file_.write('\n')
                 comments = spec[secname]['__many__'].comments
                 for key, comment in sorted(comments.items()):
-                    write_section(spec[secname]['__many__'][key], secname,
-                                  key, comment, file_)
+                    write_section(
+                        spec[secname]['__many__'][key],
+                        secname,
+                        key,
+                        comment,
+                        file_,
+                    )
             else:
                 write_section(spec[secname][key], secname, key, comment, file_)
 
@@ -181,7 +188,6 @@ def write_section(section, secname, key, comment, file_):
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = True
 
-
 # -- Options for HTML output ----------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
@@ -314,8 +320,13 @@ def write_section(section, secname, key, comment, file_):
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-  (master_doc, 'Todoman.tex', 'Todoman Documentation',
-   'Hugo Osvaldo Barrera', 'manual'),
+    (
+        master_doc,
+        'Todoman.tex',
+        'Todoman Documentation',
+        'Hugo Osvaldo Barrera',
+        'manual',
+    ),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -338,29 +349,36 @@ def write_section(section, secname, key, comment, file_):
 # If false, no module index is generated.
 #  latex_domain_indices = True
 
-
 # -- Options for manual page output ---------------------------------------
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [
-    (master_doc, 'todoman', 'Todoman Documentation',
-     [author], 1)
-]
+man_pages = [(
+    master_doc,
+    'todoman',
+    'Todoman Documentation',
+    [author],
+    1,
+)]
 
 # If true, show URL addresses after external links.
 #  man_show_urls = False
 
-
 # -- Options for Texinfo output -------------------------------------------
 
 # Grouping the document tree into Texinfo files. List of tuples
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  (master_doc, 'Todoman', 'Todoman Documentation',
-   author, 'Todoman', 'One line description of project.',
-   'Miscellaneous'),
+    (
+        master_doc,
+        'Todoman',
+        'Todoman Documentation',
+        author,
+        'Todoman',
+        'One line description of project.',
+        'Miscellaneous',
+    ),
 ]
 
 # Documents to append as an appendix to all manuals.

setup.cfg

@@ -4,3 +4,9 @@ test=pytest
 [tool:pytest]
 testpaths = tests
 addopts = --cov=todoman --cov-report=term-missing
+
+[yapf]
+coalesce_brackets = true
+dedent_closing_brackets = true
+space_between_ending_comma_and_closing_bracket = false
+split_arguments_when_comma_terminated = true

setup.py

@@ -14,7 +14,7 @@
     entry_points={
         'console_scripts': [
             'todo = todoman.cli:cli',
-        ]
+        ],
     },
     install_requires=open('requirements.txt').readlines(),
     long_description=open('README.rst').read(),

tests/conftest.py

@@ -24,29 +24,29 @@ def default_database(tmpdir):
 @pytest.fixture
 def config(tmpdir, default_database):
     path = tmpdir.join('config')
-    path.write('[main]\n'
-               'path = {}/*\n'
-               'date_format = %Y-%m-%d\n'
-               'time_format = \n'
-               'cache_path = {}\n'
-               .format(str(tmpdir), str(tmpdir.join('cache.sqlite3'))))
+    path.write(
+        '[main]\n'
+        'path = {}/*\n'
+        'date_format = %Y-%m-%d\n'
+        'time_format = \n'
+        'cache_path = {}\n'
+        .format(str(tmpdir), str(tmpdir.join('cache.sqlite3')))
+    )
     return path
 
 
 @pytest.fixture
 def runner(config, sleep):
-
     class SleepyCliRunner(CliRunner):
         """
         Sleeps before invoking to make sure cache entries have expired.
         """
+
         def invoke(self, *args, **kwargs):
             sleep()
             return super().invoke(*args, **kwargs)
 
-    return SleepyCliRunner(env={
-        'TODOMAN_CONFIG': str(config)
-    })
+    return SleepyCliRunner(env={'TODOMAN_CONFIG': str(config)})
 
 
 @pytest.fixture
@@ -55,9 +55,7 @@ def inner(name, content, list_name='default'):
         path = tmpdir.ensure_dir(list_name).join(name)
         path.write(
             'BEGIN:VCALENDAR\n'
-            'BEGIN:VTODO\n' +
-            content +
-            'END:VTODO\n'
+            'BEGIN:VTODO\n' + content + 'END:VTODO\n'
             'END:VCALENDAR'
         )
         return path
@@ -67,7 +65,6 @@ def inner(name, content, list_name='default'):
 
 @pytest.fixture
 def now_for_tz():
-
     def inner(tz='CET'):
         """
         Provides the current time cast to a given timezone.
@@ -155,7 +152,6 @@ def inner():
 
 @pytest.fixture
 def todos(default_database, sleep):
-
     def inner(**filters):
         sleep()
         default_database.update_cache()
@@ -164,14 +160,15 @@ def inner(**filters):
     return inner
 
 
-settings.register_profile("ci", settings(
-    max_examples=1000,
-    verbosity=Verbosity.verbose,
-    suppress_health_check=[HealthCheck.too_slow]
-))
-settings.register_profile("deterministic", settings(
-    derandomize=True,
-))
+settings.register_profile(
+    "ci",
+    settings(
+        max_examples=1000,
+        verbosity=Verbosity.verbose,
+        suppress_health_check=[HealthCheck.too_slow]
+    )
+)
+settings.register_profile("deterministic", settings(derandomize=True,))
 
 if os.getenv('DETERMINISTIC_TESTS', 'false').lower() == 'true':
     settings.load_profile("deterministic")

tests/test_backend.py

@@ -92,20 +92,22 @@ def test_sequence_increment(default_database, todo_factory, todos):
 def test_normalize_datetime():
     writter = VtodoWritter(None)
     assert (
-        writter.normalize_datetime(date(2017, 6, 17)) ==
-        datetime(2017, 6, 17, tzinfo=tzlocal())
+        writter.normalize_datetime(date(2017, 6, 17)) == datetime(
+            2017, 6, 17, tzinfo=tzlocal()
+        )
     )
     assert (
-        writter.normalize_datetime(datetime(2017, 6, 17)) ==
-        datetime(2017, 6, 17, tzinfo=tzlocal())
+        writter.normalize_datetime(datetime(2017, 6, 17)) == datetime(
+            2017, 6, 17, tzinfo=tzlocal()
+        )
     )
     assert (
-        writter.normalize_datetime(datetime(2017, 6, 17, 12, 19)) ==
-        datetime(2017, 6, 17, 12, 19, tzinfo=tzlocal())
+        writter.normalize_datetime(datetime(2017, 6, 17, 12, 19)) == datetime(
+            2017, 6, 17, 12, 19, tzinfo=tzlocal()
+        )
     )
     assert (
         writter.normalize_datetime(
             datetime(2017, 6, 17, 12, tzinfo=tzlocal())
-        ) ==
-        datetime(2017, 6, 17, 12, tzinfo=tzlocal())
+        ) == datetime(2017, 6, 17, 12, tzinfo=tzlocal())
     )