webcode-tk 1.2.19__tar.gz → 1.2.21__tar.gz

{webcode_tk-1.2.19 → webcode_tk-1.2.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webcode-tk
-Version: 1.2.19
+Version: 1.2.21
 Summary: A set of tools for inspecting HTML and CSS code
 License: MIT
 License-File: LICENSE.rst

{webcode_tk-1.2.19 → webcode_tk-1.2.21}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "webcode-tk"
-version = "1.2.19"
+version = "1.2.21"
 description = "A set of tools for inspecting HTML and CSS code"
 authors = ["hundredvisionsguy <cwinikka@gmail.com>"]
 keywords = ["html", "validation", "css", ]

{webcode_tk-1.2.19 → webcode_tk-1.2.21}/webcode_tk/__init__.py

@@ -40,4 +40,4 @@
 - **`validator_tools`**: sends HTML or CSS code to the W3C Validator to check
           for errors.
 """
-__version__ = "1.2.19"
+__version__ = "1.2.21"

{webcode_tk-1.2.19 → webcode_tk-1.2.21}/webcode_tk/font_tools.py

@@ -24,13 +24,12 @@ font-file or some other hidden calculation from the browser.
 
 import re
 from typing import Any
-from typing import Union
+
 from file_clerk import clerk
 
 from webcode_tk import css_tools
 from webcode_tk import html_tools as html
 
-
 absolute_keyword_regex = (
     r"\b(?:xx-small|x-small|small(?!-caps)|medium|large|x-large|"
 )
@@ -137,7 +136,7 @@ def get_font_unit(value: str) -> str:
     """returns unit being use when setting font-size"""
     unit = ""
     # Check for relative keywords
-    if value in KEYWORD_SIZE_MAP.keys():
+    if value in KEYWORD_SIZE_MAP:
         unit = "absolute_keyword"
     elif relative_keyword.search(value):
         unit = "relative_keyword"
@@ -169,7 +168,7 @@ def split_value_unit(value: str) -> tuple:
         value_unit: a tuple of the value and the unit.
     """
     value_unit = ["", ""]
-    if value in KEYWORD_SIZE_MAP.keys():
+    if value in KEYWORD_SIZE_MAP:
         value_unit = (value, "absolute_keyword")
     elif relative_keyword.search(value):
         value_unit = (value, "relative_keyword")
@@ -236,17 +235,15 @@ def is_large_text(size: float, is_bold: bool) -> bool:
         is_large: whether the text is considered large or not.
     """
     is_large = False
-    if size >= 24:
-        is_large = True
-    elif is_bold and size >= 18.66:
+    if size >= 24 or is_bold and size >= 18.66:
         is_large = True
     return is_large
 
 
 def compute_font_size(
-    value: Union[str, int, float],
+    value: str | float,
     unit: str,
-    parent_size: Union[int, float] = 16.0,
+    parent_size: float = 16.0,
     element_name: str = "",
 ) -> float:
     """Computes font size based on value, unit, and possibly parent size.
@@ -288,7 +285,7 @@ def compute_font_size(
         percentage = value * 0.01
         computed_size = parent_size * percentage
     elif unit == "em":
-        if element_name.lower() in HEADING_SIZES.keys():
+        if element_name.lower() in HEADING_SIZES:
             # factor = HEADING_SIZES.get(element_name).split("e")[0]
             computed_size = parent_size * value  # * factor
         else:
@@ -296,7 +293,7 @@ def compute_font_size(
     elif unit in ("unset", "inherit"):
         computed_size = parent_size
     elif unit in "revert":
-        if element_name.lower() in HEADING_SIZES.keys():
+        if element_name.lower() in HEADING_SIZES:
             ems = HEADING_SIZES.get(element_name)
             multiplier = ems.split("e")[0]
             computed_size = parent_size * float(multiplier)
@@ -340,13 +337,12 @@ def is_valid_shorthand(value: str) -> bool:
         if ignore:
             continue
         font_size_values = get_numeric_fontsize_values(val)
-        if font_size_values:
-            targets_size = True
-        elif val in KEYWORD_SIZE_MAP.keys():
-            targets_size = True
-        elif val in ("larger", "smaller"):
-            targets_size = True
-        elif val in UNIT_TO_PT_CONVERSIONS.keys():
+        if (
+            font_size_values
+            or val in KEYWORD_SIZE_MAP
+            or val in ("larger", "smaller")
+            or val in UNIT_TO_PT_CONVERSIONS
+        ):
             targets_size = True
 
         # check for font family.
@@ -419,9 +415,8 @@ def get_google_font_report(project_dir: str, min=1, max=2) -> str:
                 families = extract_families(font_data)
             if families:
                 for family in google_fonts_linked:
-                    if family in families:
-                        if family not in fonts_used:
-                            fonts_used.append(family)
+                    if family in families and family not in fonts_used:
+                        fonts_used.append(family)
 
         num_used = len(fonts_used)
         if num_used >= min and num_used <= max:

webcode_tk-1.2.21/webcode_tk/requirements.yml

@@ -0,0 +1,24 @@
+name: Update requirements.txt
+
+on:
+  push:
+    branches: [main]
+  workflow_dispatch:
+
+jobs:
+  requirements:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+      - name: Generate requirements.txt
+        run: poetry export --with dev -f requirements.txt -o requirements.txt
+      - name: Commit and push requirements.txt
+        run: |
+          git config user.name "github-actions"
+          git config user.email "github-actions@github.com"
+          git add requirements.txt
+          git commit -m "chore: update requirements.txt" || true
+          git push

{webcode_tk-1.2.19 → webcode_tk-1.2.21}/webcode_tk/validator_tools.py

@@ -103,7 +103,7 @@ def get_markup_validity(file_path: str) -> list:
         try:
             errors = r.json()
             errors = errors.get("messages")
-        except Exception:
+        except ValueError:
             # We need to use the web browser
             errors = get_validation_by_browser(file_path)
 
@@ -252,7 +252,7 @@ def get_validation_by_browser(file_path: str) -> list:
             browser["fragment"] = html_code
             browser.submit_selected()
             results = browser.get_current_page().select("div#results")
-    except Exception:
+    except requests.ConnectionError:
         # Convert the file "no_css_connection.html" into a soup tag object
         no_connection_code = (
             "<h1>Sorry, but we could not make a connection</h1>"
@@ -288,11 +288,18 @@ def validate_css(css_code: str) -> bs4.ResultSet:
             browser["text"] = css_code
             browser.submit_selected()
             results = browser.get_current_page().select("#results_container")
-    except Exception:
-        # Convert the file "no_css_connection.html" into a soup tag object
-        no_connection_code = clerk.file_to_string(
-            "webanalyst/no_css_connection.html"
-        )
+    except requests.ConnectionError:
+        no_connection_code = """
+        <div id="results_container">
+            <table>
+                <tr class="error">
+                    <td>NA</td>
+                    <td>NA</td>
+                    <td>Sorry, but we could not make a connection</td>
+                </tr>
+            </table>
+        </div>
+        """
         soup = BeautifulSoup(no_connection_code, "lxml")
         # Convert string to result set
         results = soup.select("#results_container")
@@ -357,6 +364,6 @@ def get_project_validation(project_dir: str, type="html") -> list:
 if __name__ == "__main__":
     path = "tests/test_files/sample_with_errors.html"
     report = get_markup_validity(path)
-    print("report is a {}.".format(type(report)))
+    print(f"report is a {type(report)}.")
     for item in report:
         print(item)