Update CI workflow to split the checkers out

masklinn · masklinn · commit 0498c91fb1cf · 2022-04-27T17:18:39.000+02:00
The checkers only need to run once, using the latest supported Python (probably?). Also fix black errors in order to re-enable it. Close ua-parser#96
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,18 +7,36 @@ on:
     branches: [ master ]
 
 jobs:
+  checks:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+    - name: Checkout working copy
+      uses: actions/checkout@v3
+    - name: Set up Python
+      uses: actions/setup-python@v3
+      with:
+        python-version: "3.8"
+    - name: Install checkers
+      run: |
+        python -mpip install --upgrade pip
+        python -mpip install black flake8
+    - name: flake
+      run: flake8 .
+    - name: black
+      run: black --check --diff --color --quiet .
+
   test:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         python-version: ["2.7", "3.6", "3.7", "3.8"]
-        include:
-          - python-version: "3.8"
-            checkers: true
 
     steps:
-    - uses: actions/checkout@v3
+    - name: Checkout working copy
+      uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v3
       with:
@@ -27,15 +45,6 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         python -m pip install -r requirements.txt -r requirements_dev.txt
-    - name: Install checkers
-      if: ${{ matrix.checkers }}
-      run: python -m pip install black flake8
-    #- name: black
-    #  if: ${{ matrix.checkers }}
-    #  run: black --check --diff .
-    - name: flake
-      if: ${{ matrix.checkers }}
-      run: flake8 .
     - name: tests
       run: |
         python setup.py develop
diff --git a/ua_parser/user_agent_parser.py b/ua_parser/user_agent_parser.py
@@ -219,7 +219,7 @@ def Parse(self, user_agent_string):
 
 
 def Parse(user_agent_string, **jsParseBits):
-    """ Parse all the things
+    """Parse all the things
     Args:
       user_agent_string: the full user agent string
       jsParseBits: javascript override bits
@@ -244,7 +244,7 @@ def Parse(user_agent_string, **jsParseBits):
 
 
 def ParseUserAgent(user_agent_string, **jsParseBits):
-    """ Parses the user-agent string for user agent (browser) info.
+    """Parses the user-agent string for user agent (browser) info.
     Args:
       user_agent_string: The full user-agent string.
       jsParseBits: javascript override bits.
@@ -290,7 +290,7 @@ def ParseUserAgent(user_agent_string, **jsParseBits):
 
 
 def ParseOS(user_agent_string, **jsParseBits):
-    """ Parses the user-agent string for operating system info
+    """Parses the user-agent string for operating system info
     Args:
       user_agent_string: The full user-agent string.
       jsParseBits: javascript override bits.
@@ -312,7 +312,7 @@ def ParseOS(user_agent_string, **jsParseBits):
 
 
 def ParseDevice(user_agent_string):
-    """ Parses the user-agent string for device info.
+    """Parses the user-agent string for device info.
     Args:
         user_agent_string: The full user-agent string.
         ua_family: The parsed user agent family name.
@@ -368,7 +368,7 @@ def ParseWithJSOverrides(
     js_user_agent_v2=None,
     js_user_agent_v3=None,
 ):
-    """ backwards compatible. use one of the other Parse methods instead! """
+    """backwards compatible. use one of the other Parse methods instead!"""
 
     # Override via JS properties.
     if js_user_agent_family is not None and js_user_agent_family != "":
@@ -404,7 +404,7 @@ def ParseWithJSOverrides(
 
 
 def Pretty(family, v1=None, v2=None, v3=None):
-    """ backwards compatible. use PrettyUserAgent instead! """
+    """backwards compatible. use PrettyUserAgent instead!"""
     if v3:
         if v3[0].isdigit():
             return "%s %s.%s.%s" % (family, v1, v2, v3)
@@ -477,7 +477,7 @@ def GetFilters(
     except ImportError:
         from yaml import SafeLoader
 
-    with open(UA_PARSER_YAML, 'rb') as fp:
+    with open(UA_PARSER_YAML, "rb") as fp:
         regexes = yaml.load(fp, Loader=SafeLoader)
 
     USER_AGENT_PARSERS = []
