Merge pull request #80 from manzanotti/WorkflowTarget

Update the GitHub action to target the main branch
manzanotti · Sep 30, 2023 · 282caea · 282caea
2 parents 24166c4 + 2b8b0cc
commit 282caea
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -4,9 +4,9 @@
 name: Build and Test
 on:
   push:
-    branches: ["master"]
+    branches: ["main"]
   pull_request:
-    branches: ["master"]
+    branches: ["main"]
   workflow_dispatch:
 permissions:
   contents: read

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -8,7 +8,7 @@ repos:
         args:
           - --safe
           - --quiet
-        files: ^(genius.*/.+)?[^/]+\.py$
+        files: ^genius.*/.+\.py$|^genius.*/tests\.py$
 
   - repo: https://gitlab.com/pycqa/flake8
     rev: 3.8.4
@@ -17,8 +17,7 @@ repos:
         additional_dependencies:
           - flake8-docstrings==1.5.0
           - pydocstyle==5.1.1
-        files: ^genius.*/.+\.py$
-        exclude: ^genius.*/tests\.py$
+        files: ^genius.*/.+\.py$|^genius.*/tests\.py$
 
   - repo: https://github.com/pycqa/isort
     rev: 5.7.0

diff --git a/geniushubclient/session.py b/geniushubclient/session.py
@@ -14,7 +14,6 @@ class GeniusService:
     """Handle all communication to the Genius Hub."""
 
     def __init__(self, hub_id, username=None, password=None, session=None) -> None:
-
         self._session = session if session else aiohttp.ClientSession()
 
         if username or password:  # use the v3 Api

diff --git a/tests/data_properties_v3_conversion/genius_zone_data_footprint_schedule_test.py b/tests/data_properties_v3_conversion/genius_zone_data_footprint_schedule_test.py
@@ -115,7 +115,6 @@ def test_when_footprint_schedule_parsed_then_footprint_schedule_has_seven_days_n
 
         for day_int, day_text in IDAY_TO_DAY.items():
             with self.subTest(day_int=day_int, day_text=day_text):
-
                 genius_zone = GeniusZone(self._device_id, self.raw_json, self.hub)
 
                 days = genius_zone.data["schedule"]["footprint"]["weekly"]

diff --git a/tests/data_properties_v3_conversion/genius_zone_data_timer_schedule_test.py b/tests/data_properties_v3_conversion/genius_zone_data_timer_schedule_test.py
@@ -114,7 +114,6 @@ def test_when_timer_schedule_parsed_then_timer_schedule_has_seven_days_named_cor
 
         for day_int, day_text in IDAY_TO_DAY.items():
             with self.subTest(day_int=day_int, day_text=day_text):
-
                 genius_zone = GeniusZone(self._device_id, self.raw_json, self.hub)
 
                 days = genius_zone.data["schedule"]["timer"]["weekly"]