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

fix: Various council fixes #361

Merged
merged 12 commits into from
Oct 15, 2023
Merged

Conversation

dp247
Copy link
Collaborator

@dp247 dp247 commented Oct 13, 2023

Fixes scrapers for the following councils:

  • Basingstoke
  • Bath & North East Somerset
  • Blackburn
  • Malvern Hill
  • Swale

Two new dependencies have been added to the TOML as some of them needed custom HTTP handlers to avoid SSL errors.

@dp247 dp247 added the python Pull requests that update Python code label Oct 13, 2023
@robbrad
Copy link
Owner

robbrad commented Oct 13, 2023

Hmm looks like it failed the lint commit 🫣 @dp247

I need to try this for myself

@dp247
Copy link
Collaborator Author

dp247 commented Oct 13, 2023

Oh no

@dp247
Copy link
Collaborator Author

dp247 commented Oct 13, 2023

Should I have a subject and type in every commit message? @OliverCullimore

Maybe that's where I'm going wrong 🤣

@OliverCullimore
Copy link
Collaborator

OliverCullimore commented Oct 13, 2023

@dp247 @robbrad Yes, each one of those commit messages should've have "fix:" at the start, then your normal message (what it calls subject).

@OliverCullimore
Copy link
Collaborator

@dp247 There's a few ways you can resolve this:

  • Un-commit then recommit your last commit with a message with the "fix:" prefix added to the start (this is what I did for you from my IDE for the last PR)

  • Make another change of some kind and commit it with the "fix:" prefix your the commit mesage

  • Ignore the lint errors and merge the PR, it just won't create a realease so the fixes will appear the next time a commit with the right prefixes is merged

@dp247
Copy link
Collaborator Author

dp247 commented Oct 13, 2023

@dp247 There's a few ways you can resolve this:

  • Un-commit then recommit your last commit with a message with the "fix:" prefix added to the start (this is what I did for you from my IDE for the last PR)
  • Make another change of some kind and commit it with the "fix:" prefix your the commit mesage
  • Ignore the lint errors and merge the PR, it just won't create a realease so the fixes will appear the next time a commit with the right prefixes is merged

Thanks for the tips - I'm gonna fix some more so I'll make sure I preface them correctly 🙏

@codecov-commenter
Copy link

codecov-commenter commented Oct 14, 2023

Codecov Report

Merging #361 (212d859) into master (7e2b723) will not change coverage.
The diff coverage is n/a.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

@@           Coverage Diff           @@
##           master     #361   +/-   ##
=======================================
  Coverage   83.44%   83.44%           
=======================================
  Files           3        3           
  Lines         151      151           
=======================================
  Hits          126      126           
  Misses         25       25           

@OliverCullimore
Copy link
Collaborator

@dp247 that commit message is looking good 🙌

The lint action will still be erroring because of the previous commits in this PR but that can just be ignored now you've added one with the prefix that will trigger the release 🙂

@dp247
Copy link
Collaborator Author

dp247 commented Oct 14, 2023

@dp247 that commit message is looking good 🙌

The lint action will still be erroring because of the previous commits in this PR but that can just be ignored now you've added one with the prefix that will trigger the release 🙂

Thank god, I was worried I'd have to bring out command line Git to amend them all hehe 🤣

@OliverCullimore
Copy link
Collaborator

@dp247 these fixes look good, are you still working on any further changes for this PR or can it be merged now?

@dp247
Copy link
Collaborator Author

dp247 commented Oct 15, 2023

@dp247 these fixes look good, are you still working on any further changes for this PR or can it be merged now?

You can merge these for now - I might do a few more today but can always open a new PR

@OliverCullimore OliverCullimore merged commit 5d16c1a into robbrad:master Oct 15, 2023
6 of 7 checks passed
@dp247 dp247 deleted the council_fixes branch March 25, 2024 15:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
python Pull requests that update Python code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants