Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump datapoint to 0.9.9 + re-enable Met Office Integration #110206

Merged
merged 16 commits into from Feb 13, 2024

Conversation

DustyArmstrong
Copy link
Contributor

@DustyArmstrong DustyArmstrong commented Feb 10, 2024

Breaking change

Proposed change

The change is to bump the datapoint dependency and update two files that still use site.id and bring them in-line with datapoint-python 0.9.9 to allow functionality to continue if the integration is re-enabled on a temporary basis until the new API wrapper can be developed.

Datapoint CHANGELOG (incl. all prior): https://github.com/EJEP/datapoint-python/blob/migrate_to_datahub/CHANGELOG.md

Datapoint PRIMARY DIFF: EJEP/datapoint-python@c07b274

Further files have been changed and can be seen here: https://github.com/EJEP/datapoint-python/commits/master/

Type of change

  • Dependency upgrade
  • Bugfix (non-breaking change which fixes an issue)
  • New integration (thank you!)
  • New feature (which adds functionality to an existing integration)
  • Deprecation (breaking change to happen in the future)
  • Breaking change (fix/feature causing existing functionality to break)
  • Code quality improvements to existing code or addition of tests

Additional information

Checklist

  • The code change is tested and works locally.
  • Local tests pass. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.
  • I have followed the development checklist
  • I have followed the perfect PR recommendations
  • The code has been formatted using Ruff (ruff format homeassistant tests)
  • Tests have been added to verify that the new code works.

If user exposed functionality or configuration variables are added/changed:

If the code communicates with devices, web services, or third-party tools:

  • The manifest file has all fields filled out correctly.
    Updated and included derived files by running: python3 -m script.hassfest.
  • New or updated dependencies have been added to requirements_all.txt.
    Updated by running python3 -m script.gen_requirements_all.
  • For the updated dependencies - a link to the changelog, or at minimum a diff between library versions is added to the PR description.
  • Untested files have been added to .coveragerc.

To help with the load of incoming pull requests:

Copy link

@home-assistant home-assistant bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @DustyArmstrong

It seems you haven't yet signed a CLA. Please do so here.

Once you do that we will be able to review and accept this pull request.

Thanks!

@home-assistant
Copy link

Please take a look at the requested changes, and use the Ready for review button when you are done, thanks 👍

Learn more about our pull request process.

@home-assistant home-assistant bot marked this pull request as draft February 10, 2024 16:54
@home-assistant
Copy link

Hey there @MrHarcombe, @avee87, mind taking a look at this pull request as it has been labeled with an integration (metoffice) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of metoffice can trigger bot actions by commenting:

  • @home-assistant close Closes the pull request.
  • @home-assistant rename Awesome new title Renames the pull request.
  • @home-assistant reopen Reopen the pull request.
  • @home-assistant unassign metoffice Removes the current integration label and assignees on the pull request, add the integration domain after the command.
  • @home-assistant add-label needs-more-information Add a label (needs-more-information, problem in dependency, problem in custom component) to the pull request.
  • @home-assistant remove-label needs-more-information Remove a label (needs-more-information, problem in dependency, problem in custom component) on the pull request.

@avee87
Copy link
Contributor

avee87 commented Feb 10, 2024

Let’s just bump the required version of datapoint to 0.9.9 in manifest and reenable the integration.

@DustyArmstrong
Copy link
Contributor Author

Let’s just bump the required version of datapoint to 0.9.9 in manifest and reenable the integration.

I did that initially on my local fork, but the variables have changed so it will fail if it stays as-is.

@avee87
Copy link
Contributor

avee87 commented Feb 10, 2024

I meant doing that in addition to your changes in this PR

Copy link
Contributor

@avee87 avee87 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@DustyArmstrong DustyArmstrong changed the title Fix variable update for Met Office in Datapoint dependancy Fix variable for Met Office in Datapoint dependancy + update dependancy + Re-enable Met Office Integration Feb 12, 2024
Copy link
Contributor

@edenhaus edenhaus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for bumping the dependency! However, could you please update the PR description to contain at least one (or multiple) of the following:

  • A link to the release notes of this package version, and all versions in between.
  • A link to the changelog of this package.
  • A link to a Git(Hub) diff/compare view from the current version to the bumped version.

This allows us to review upstream changes, which is needed to decide this change is working as intended and/or if we can include it in, for example, a patch release of Home Assistant.

Thanks already! 👍

@home-assistant home-assistant bot marked this pull request as draft February 12, 2024 12:56
@edenhaus edenhaus changed the title Fix variable for Met Office in Datapoint dependancy + update dependancy + Re-enable Met Office Integration Bump datapoint to 0.9.9 + Re-enable Met Office Integration Feb 12, 2024
@DustyArmstrong
Copy link
Contributor Author

DustyArmstrong commented Feb 13, 2024

Need to fix the CI for 3.12.

Apologies for the back and forth with this, my initial intent with the PR was just to add a small fix to 2 files to assist whoever re-enabled the integration (that just happened to be me so I'm still picking things up).

EDIT: Modified the __init__ to remove the 3.12 reference.

@DustyArmstrong DustyArmstrong marked this pull request as draft February 13, 2024 13:38
@DustyArmstrong
Copy link
Contributor Author

Not sure why this keeps hitting problems but I've re-run Ruff.

@DustyArmstrong DustyArmstrong marked this pull request as ready for review February 13, 2024 13:47
Update helpers.py to reflect changes made to variable in https://github.com/EJEP/datapoint-python/blob/master/CHANGELOG.md
Update sensor.py to reflect changes made to variables as mentioned in https://github.com/EJEP/datapoint-python/blob/master/CHANGELOG.md
Update __init__.py to remove reference to Python 3.12 requirement.
Update helpers.py to remove reference to <3.12
Updated data.py to remove references to Python < 3.12 though having the original lines did not actually impact functionality
Update for v 0.9.9
Remove disabled tag
Bump datapoint dependency following fix EJEP/datapoint-python#183
Generated with requirements script
Copy link
Contributor

@edenhaus edenhaus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @DustyArmstrong 👍

@edenhaus edenhaus merged commit 3bf6d52 into home-assistant:dev Feb 13, 2024
53 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators Feb 14, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants