From 0add24d055aa4d668320e47735f29ce8676db432 Mon Sep 17 00:00:00 2001 From: Robert Bradley Date: Wed, 29 Jan 2025 08:51:46 +0000 Subject: [PATCH 1/8] fix: Update CheshireEastCouncil.py --- .../uk_bin_collection/councils/CheshireEastCouncil.py | 1 - 1 file changed, 1 deletion(-) diff --git a/uk_bin_collection/uk_bin_collection/councils/CheshireEastCouncil.py b/uk_bin_collection/uk_bin_collection/councils/CheshireEastCouncil.py index b38e8dc015..f0b93246ef 100644 --- 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") From 99c2baef57dc9539531bd4f9d3f7b37bd45c36b0 Mon Sep 17 00:00:00 2001 From: Robert Bradley Date: Wed, 29 Jan 2025 08:54:40 +0000 Subject: [PATCH 2/8] fix: Update behave_pull_request.yml --- .github/workflows/behave_pull_request.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/behave_pull_request.yml b/.github/workflows/behave_pull_request.yml index a8f448cb9f..beda1d01bb 100644 --- a/.github/workflows/behave_pull_request.yml +++ b/.github/workflows/behave_pull_request.yml @@ -196,7 +196,7 @@ jobs: runs-on: ubuntu-latest permissions: contents: write - + needs: report steps: # Checkout the repository to work with the git history @@ -256,10 +256,10 @@ jobs: 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 + git push https://x-access-token:${{ secrets.GH_PAGES_TOKEN }}@github.com/${{ github.repository }}.git gh-pages From 7c06b38bd1862939dfb292b5999df7a3378c841a Mon Sep 17 00:00:00 2001 From: Robert Bradley Date: Wed, 29 Jan 2025 13:52:42 +0000 Subject: [PATCH 3/8] fix: Update behave_pull_request.yml --- .github/workflows/behave_pull_request.yml | 33 ++++++----------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/.github/workflows/behave_pull_request.yml b/.github/workflows/behave_pull_request.yml index beda1d01bb..6c4fda2e6e 100644 --- a/.github/workflows/behave_pull_request.yml +++ b/.github/workflows/behave_pull_request.yml @@ -2,7 +2,7 @@ name: Test Councils (Pull Request Only) on: workflow_dispatch: - pull_request: + pull_request_target: branches: [ "master" ] paths-ignore: - "wiki/**" @@ -239,27 +239,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 https://x-access-token:${{ secrets.GH_PAGES_TOKEN }}@github.com/${{ github.repository }}.git gh-pages + - name: Deploy + uses: peaceiris/actions-gh-pages@v4 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_branch: gh-pages + publish_dir: ./ + keep_files: true From 3b6dc1185d48933c695fc2db76a39967a96c45fd Mon Sep 17 00:00:00 2001 From: Robert Bradley Date: Wed, 29 Jan 2025 13:55:26 +0000 Subject: [PATCH 4/8] fix: Update behave_pull_request.yml --- .github/workflows/behave_pull_request.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/behave_pull_request.yml b/.github/workflows/behave_pull_request.yml index 6c4fda2e6e..6745a358b0 100644 --- a/.github/workflows/behave_pull_request.yml +++ b/.github/workflows/behave_pull_request.yml @@ -2,6 +2,12 @@ name: Test Councils (Pull Request Only) on: workflow_dispatch: + pull_request: + branches: [ "master" ] + paths-ignore: + - "wiki/**" + - "**/*.md" + - "uk_bin_collection_api_server/**" pull_request_target: branches: [ "master" ] paths-ignore: From 40050240243fb973dbbd352b9a0e9c57b50a02ff Mon Sep 17 00:00:00 2001 From: Robert Bradley Date: Wed, 29 Jan 2025 16:48:26 +0000 Subject: [PATCH 5/8] fix: Update behave_pull_request.yml --- .github/workflows/behave_pull_request.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/behave_pull_request.yml b/.github/workflows/behave_pull_request.yml index 6745a358b0..594200f593 100644 --- a/.github/workflows/behave_pull_request.yml +++ b/.github/workflows/behave_pull_request.yml @@ -234,7 +234,7 @@ jobs: - 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 + 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 @@ -250,5 +250,5 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_branch: gh-pages - publish_dir: ./ + publish_dir: ./allure-history-partial keep_files: true From 63433486e24347b565e7278200b2414af1d84b1a Mon Sep 17 00:00:00 2001 From: Robert Bradley Date: Wed, 29 Jan 2025 16:56:26 +0000 Subject: [PATCH 6/8] fix: Update behave_pull_request.yml --- .github/workflows/behave_pull_request.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/behave_pull_request.yml b/.github/workflows/behave_pull_request.yml index 594200f593..5e23c31d07 100644 --- a/.github/workflows/behave_pull_request.yml +++ b/.github/workflows/behave_pull_request.yml @@ -233,8 +233,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/* allure-history-partial/ # Move files to the target directory + mkdir -p allure-history-partial/3.12 # Ensure the target directory exists + mv temp_extracted/allure-history-partial/* allure-history-partial/3.12/ # Move files to the target directory rm -rf temp_extracted # Clean up the temporary extraction folder # Remove the tar reports From 4c6590e9f424aa29e7aafc05cc37c69b292b7eee Mon Sep 17 00:00:00 2001 From: Robert Bradley Date: Wed, 29 Jan 2025 17:00:15 +0000 Subject: [PATCH 7/8] fix: Update behave_pull_request.yml --- .github/workflows/behave_pull_request.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/behave_pull_request.yml b/.github/workflows/behave_pull_request.yml index 5e23c31d07..5faef68077 100644 --- a/.github/workflows/behave_pull_request.yml +++ b/.github/workflows/behave_pull_request.yml @@ -200,6 +200,9 @@ jobs: deploy: name: Deploy Reports runs-on: ubuntu-latest + strategy: + matrix: + python-version: [3.12] permissions: contents: write @@ -213,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 @@ -233,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 allure-history-partial/3.12 # Ensure the target directory exists - mv temp_extracted/allure-history-partial/* allure-history-partial/3.12/ # 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 From f2a3094efa649cd5f457badca3a3a802619bd64b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 29 Jan 2025 17:41:45 +0000 Subject: [PATCH 8/8] =?UTF-8?q?bump:=20version=200.128.4=20=E2=86=92=200.1?= =?UTF-8?q?28.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 12 ++++++++++++ custom_components/uk_bin_collection/config_flow.py | 2 +- custom_components/uk_bin_collection/manifest.json | 4 ++-- pyproject.toml | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 33b8a61a64..317293e7e4 100644 --- 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 index 133aca23eb..28c0ea3db4 100644 --- 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://raw.githubusercontent.com/robbrad/UKBinCollectionData/0.128.4/uk_bin_collection/tests/input.json" + url = "https://raw.githubusercontent.com/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 index 59b81c2a3f..ea0641b88c 100644 --- 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 index 27ac5fbc80..b3c837d9b2 100644 --- 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 "]