QA: moved to black and fixed style

Author: AlexanderWillner

Makefile

@@ -113,16 +113,16 @@ clean:
 	@rm -f .coverage
 
 auto-style:
-	@type autopep8 >/dev/null 2>&1 || (echo "Run '$(PIP) install autopep8' first." >&2 ; exit 1)
-	@autopep8 -i -r $(SRC_CORE) $(SRC_TEST) setup.py
+	@type black >/dev/null 2>&1 || (echo "Run '$(PIP) install black' first." >&2 ; exit 1)
+	@black $(SRC_CORE) $(SRC_TEST) setup.py
 	@type standard >/dev/null 2>&1 || (echo "Run 'npm install -g standard' first." >&2 ; exit 1)
 	@standard --fix resources/*.js
 
-lint: auto-style code-style code-lint js-lint css-lint
+lint: code-style code-lint js-lint css-lint
 
 code-style:
 	@type pycodestyle >/dev/null 2>&1 || (echo "Run '$(PIP) install pycodestyle' first." >&2 ; exit 1)
-	@pycodestyle --max-line-length=80 --exclude=*appstore* $(SRC_CORE) $(SRC_TEST)
+	@pycodestyle --exclude=*appstore* $(SRC_CORE) $(SRC_TEST)
 
 code-lint:
 	@type pylint >/dev/null 2>&1 || (echo "Run '$(PIP) install pylint' first." >&2 ; exit 1)

setup.cfg

@@ -0,0 +1,11 @@
+[metadata]
+version = attr: things3.__version__
+
+[pycodestyle]
+max_line_length = 88
+ignore = E203,W503
+
+[flake8]
+max-line-length = 88
+max-complexity = 10
+ignore = E203,W503

setup.py

@@ -16,26 +16,28 @@ def package_files(directory):
     return paths
 
 
-APP = ['bin/things-app']
+APP = ["bin/things-app"]
 APP_NAME = "KanbanView"
 AUTHOR = "Alexander Willner"
 AUTHOR_MAIL = "[email protected]"
 DESCRIPTON = "A simple read-only CLI, API and Web Service for Things 3"
 URL = "https://kanbanview.app"
 VERSION = "2.7.0.dev1"
-DATA_FILES = package_files('resources')
+DATA_FILES = package_files("resources")
 OPTIONS = {
-    'argv_emulation': False,
-    'iconfile': 'resources/icon.icns',
-    'plist': {'CFBundleName': APP_NAME,
-              'CFBundleDisplayName': APP_NAME,
-              'CFBundleGetInfoString': APP_NAME,
-              'CFBundleIdentifier': "ws.willner.kanbanview",
-              'CFBundleVersion': VERSION,
-              'LSApplicationCategoryType': "public.app-category.productivity",
-              'LSMinimumSystemVersion': "10.13.0",
-              'NSHumanReadableCopyright': 'Copyright 2020 ' + AUTHOR},
-    'optimize': '2'
+    "argv_emulation": False,
+    "iconfile": "resources/icon.icns",
+    "plist": {
+        "CFBundleName": APP_NAME,
+        "CFBundleDisplayName": APP_NAME,
+        "CFBundleGetInfoString": APP_NAME,
+        "CFBundleIdentifier": "ws.willner.kanbanview",
+        "CFBundleVersion": VERSION,
+        "LSApplicationCategoryType": "public.app-category.productivity",
+        "LSMinimumSystemVersion": "10.13.0",
+        "NSHumanReadableCopyright": "Copyright 2020 " + AUTHOR,
+    },
+    "optimize": "2",
 }
 
 
@@ -59,18 +61,18 @@ def package_files(directory):
         "Operating System :: MacOS :: MacOS X",
         "Environment :: Console",
         "Framework :: Flask",
-        "Natural Language :: English"
+        "Natural Language :: English",
     ],
-    python_requires='>=3.6',
+    python_requires=">=3.6",
     version=VERSION,
     data_files=DATA_FILES,
-    options={'py2app': OPTIONS},
-    setup_requires=['py2app'],
+    options={"py2app": OPTIONS},
+    setup_requires=["py2app"],
     entry_points={
-        'console_scripts': [
-            'things-cli = things3.things3_cli:main',
-            'things-api = things3.things3_api:main',
-            'things-kanban = things3.things3_app:main'
+        "console_scripts": [
+            "things-cli = things3.things3_cli:main",
+            "things-api = things3.things3_api:main",
+            "things-kanban = things3.things3_app:main",
         ]
-    }
+    },
 )

tests/test_things3.py

@@ -13,16 +13,16 @@ class Things3Case(unittest.TestCase):
     FILEPATH = dict(filepath="resources/demo.sqlite3")
 
     def setUp(self):
-        self.things3 = Things3(database='resources/demo.sqlite3')
-        self.things3.tag_mit = 'MIT'
+        self.things3 = Things3(database="resources/demo.sqlite3")
+        self.things3.tag_mit = "MIT"
 
     def test_today(self):
         """Test Today."""
         tasks = self.things3.get_today()
         self.assertEqual(4, len(tasks))
         titles = []
         for task in tasks:
-            titles.append(task['title'])
+            titles.append(task["title"])
         self.assertIn("Today MIT task without a project", titles)
         self.assertIn("Today items are shown here", titles)
 
@@ -32,7 +32,7 @@ def test_inbox(self):
         self.assertEqual(3, len(tasks))
         titles = []
         for task in tasks:
-            titles.append(task['title'])
+            titles.append(task["title"])
         self.assertIn("Currently Things 3 tasks are supported", titles)
         self.assertIn("This is a demo setup", titles)
         self.assertIn("New tasks are shown here", titles)
@@ -44,7 +44,7 @@ def test_upcoming(self):
         # things.py: was 6 in old version
         titles = []
         for task in tasks:
-            titles.append(task['title'])
+            titles.append(task["title"])
         self.assertIn("Waiting for this...", titles)
 
     def test_next(self):
@@ -122,9 +122,9 @@ def test_get_areas(self):
     def test_get_minutes_today(self):
         """Test get minutes today."""
         minutes = self.things3.get_minutes_today()
-        self.assertEqual([{'minutes': 35}], minutes)
+        self.assertEqual([{"minutes": 35}], minutes)
 
-#    @unittest.skip(reason="not migrated to new lib")
+    #    @unittest.skip(reason="not migrated to new lib")
     def test_anonymize(self):
         """Test anonymized tasks."""
         tasks = self.things3.get_today()
@@ -134,5 +134,5 @@ def test_anonymize(self):
         self.assertNotEqual(tasks.pop(), task)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()

tests/test_things3_api.py

@@ -13,9 +13,9 @@ class Things3APICase(unittest.TestCase):
     """Class documentation goes here."""
 
     things3_api = things3_api.Things3API()
-    things3 = things3.Things3(database='resources/demo.sqlite3')
+    things3 = things3.Things3(database="resources/demo.sqlite3")
     things3.config = configparser.ConfigParser()
-    things3.config.read('tests/kanbanviewrc')
+    things3.config.read("tests/kanbanviewrc")
     things3_api.things3 = things3
 
     def test_today(self):
@@ -35,7 +35,7 @@ def test_not_implemented(self):
 
     def test_not_found(self):
         """Test not found."""
-        result = self.things3_api.on_get('sdf').status_code
+        result = self.things3_api.on_get("sdf").status_code
         self.assertEqual(404, result)
 
     def test_toggle(self):
@@ -51,8 +51,7 @@ def test_toggle(self):
 
     def test_filter(self):
         """Test Filter."""
-        self.things3_api.api_filter(
-            'project', 'F736F7F8-C9D5-4F30-B158-3684669985BC')
+        self.things3_api.api_filter("project", "F736F7F8-C9D5-4F30-B158-3684669985BC")
         result = json.loads(self.things3_api.api("next").response[0])
         self.assertEqual(26, len(result))
         self.things3_api.api_filter_reset()
@@ -61,15 +60,14 @@ def test_filter(self):
 
     def test_get_file(self):
         """Test get file."""
-        result = self.things3_api.on_get(
-            "/kanban.html").response[0].decode("utf-8")
+        result = self.things3_api.on_get("/kanban.html").response[0].decode("utf-8")
         self.assertIn("kanban.js", result)
 
     def test_config(self):
         """Test configuration."""
-        result = self.things3_api.config_get('TAG_MIT').response[0]
+        result = self.things3_api.config_get("TAG_MIT").response[0]
         self.assertEqual(b"MIT", result)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()

tests/test_things3_cli.py

@@ -12,12 +12,14 @@
 class Things3CLICase(unittest.TestCase):
     """Class documentation goes here."""
 
-    things3_cli = things3_cli.Things3CLI(database='resources/demo.sqlite3')
+    things3_cli = things3_cli.Things3CLI(database="resources/demo.sqlite3")
 
     def test_methods(self):
         """Invoke all commands."""
         parser = self.things3_cli.get_parser()
-        for command in parser._subparsers._actions[1].choices:  # noqa # pylint: disable=protected-access
+        for command in parser._subparsers._actions[  # pylint: disable=W0212
+            1
+        ].choices:
             if command != "feedback":
                 args = parser.parse_args([command])
                 new_out = io.StringIO()
@@ -31,7 +33,7 @@ def test_methods(self):
 
     def test_today(self):
         """Test Today."""
-        args = self.things3_cli.get_parser().parse_args(['today'])
+        args = self.things3_cli.get_parser().parse_args(["today"])
         new_out = io.StringIO()
         old_out = sys.stdout
         try:
@@ -43,7 +45,7 @@ def test_today(self):
 
     def test_csv(self):
         """Test Next via CSV."""
-        args = self.things3_cli.get_parser().parse_args(['-c', 'next'])
+        args = self.things3_cli.get_parser().parse_args(["-c", "next"])
         new_out = io.StringIO()
         old_out = sys.stdout
         try:
@@ -55,7 +57,7 @@ def test_csv(self):
 
     def test_json(self):
         """Test Upcoming via JSON."""
-        args = self.things3_cli.get_parser().parse_args(['-j', 'upcoming'])
+        args = self.things3_cli.get_parser().parse_args(["-j", "upcoming"])
         new_out = io.StringIO()
         old_out = sys.stdout
         try:
@@ -66,5 +68,5 @@ def test_json(self):
         self.assertIn("4F7006C4ADF7", new_out.getvalue())
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()

tests/test_things3_kanban.py

@@ -12,7 +12,7 @@
 class Things3KanbanCase(unittest.TestCase):
     """Class documentation goes here."""
 
-    things3 = Things3(database='resources/demo.sqlite3')
+    things3 = Things3(database="resources/demo.sqlite3")
 
     class CustomStringIO(io.StringIO):
         """Do not close output for testing."""
@@ -28,5 +28,5 @@ def test_today(self):
         self.assertIn("Today MIT", output.getvalue())
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()