uk_bin_collection 0.154.0__tar.gz → 0.157.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (358) hide show
  1. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/PKG-INFO +1 -1
  2. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/pyproject.toml +6 -2
  3. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/tests/input.json +21 -10
  4. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/AberdeenCityCouncil.py +0 -1
  5. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/DacorumBoroughCouncil.py +22 -13
  6. uk_bin_collection-0.157.0/uk_bin_collection/uk_bin_collection/councils/EastDunbartonshireCouncil.py +52 -0
  7. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/IslingtonCouncil.py +8 -5
  8. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/LancasterCityCouncil.py +23 -10
  9. uk_bin_collection-0.157.0/uk_bin_collection/uk_bin_collection/councils/MidSuffolkDistrictCouncil.py +174 -0
  10. uk_bin_collection-0.157.0/uk_bin_collection/uk_bin_collection/councils/NewForestCouncil.py +201 -0
  11. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/NewportCityCouncil.py +138 -21
  12. uk_bin_collection-0.157.0/uk_bin_collection/uk_bin_collection/councils/NorthumberlandCouncil.py +324 -0
  13. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/OxfordCityCouncil.py +1 -0
  14. uk_bin_collection-0.157.0/uk_bin_collection/uk_bin_collection/councils/RenfrewshireCouncil.py +291 -0
  15. uk_bin_collection-0.157.0/uk_bin_collection/uk_bin_collection/councils/RotherhamCouncil.py +89 -0
  16. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SomersetCouncil.py +136 -21
  17. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SouthGloucestershireCouncil.py +18 -22
  18. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/TestValleyBoroughCouncil.py +138 -21
  19. uk_bin_collection-0.154.0/uk_bin_collection/uk_bin_collection/councils/MidSuffolkDistrictCouncil.py +0 -196
  20. uk_bin_collection-0.154.0/uk_bin_collection/uk_bin_collection/councils/NewForestCouncil.py +0 -144
  21. uk_bin_collection-0.154.0/uk_bin_collection/uk_bin_collection/councils/NorthumberlandCouncil.py +0 -145
  22. uk_bin_collection-0.154.0/uk_bin_collection/uk_bin_collection/councils/RenfrewshireCouncil.py +0 -134
  23. uk_bin_collection-0.154.0/uk_bin_collection/uk_bin_collection/councils/RotherhamCouncil.py +0 -57
  24. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/LICENSE +0 -0
  25. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/README.md +0 -0
  26. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/Local_Authority_Boundaries.geojson +0 -0
  27. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/README.rst +0 -0
  28. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/compare_lad_codes.py +0 -0
  29. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/map.html +0 -0
  30. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/tests/check_selenium_url_in_input.json.py +0 -0
  31. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/tests/council_feature_input_parity.py +0 -0
  32. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/tests/features/environment.py +0 -0
  33. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/tests/features/validate_council_outputs.feature +0 -0
  34. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/tests/generate_map_test_results.py +0 -0
  35. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/tests/output.schema +0 -0
  36. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/tests/step_defs/step_helpers/file_handler.py +0 -0
  37. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/tests/step_defs/test_validate_council.py +0 -0
  38. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/tests/test_collect_data.py +0 -0
  39. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/tests/test_common_functions.py +0 -0
  40. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/tests/test_conftest.py +0 -0
  41. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/tests/test_get_data.py +0 -0
  42. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/collect_data.py +0 -0
  43. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/common.py +0 -0
  44. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/AberdeenshireCouncil.py +0 -0
  45. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/AdurAndWorthingCouncils.py +0 -0
  46. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/AmberValleyBoroughCouncil.py +0 -0
  47. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/AngusCouncil.py +0 -0
  48. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/AntrimAndNewtonabbeyCouncil.py +0 -0
  49. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/ArdsAndNorthDownCouncil.py +0 -0
  50. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/ArgyllandButeCouncil.py +0 -0
  51. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/ArmaghBanbridgeCraigavonCouncil.py +0 -0
  52. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/ArunCouncil.py +0 -0
  53. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/AshfieldDistrictCouncil.py +0 -0
  54. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/AshfordBoroughCouncil.py +0 -0
  55. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BCPCouncil.py +0 -0
  56. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BaberghDistrictCouncil.py +0 -0
  57. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BarkingDagenham.py +0 -0
  58. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BarnetCouncil.py +0 -0
  59. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BarnsleyMBCouncil.py +0 -0
  60. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BasildonCouncil.py +0 -0
  61. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BasingstokeCouncil.py +0 -0
  62. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BathAndNorthEastSomersetCouncil.py +0 -0
  63. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BedfordBoroughCouncil.py +0 -0
  64. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BedfordshireCouncil.py +0 -0
  65. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BelfastCityCouncil.py +0 -0
  66. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BexleyCouncil.py +0 -0
  67. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BirminghamCityCouncil.py +0 -0
  68. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BlabyDistrictCouncil.py +0 -0
  69. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BlackburnCouncil.py +0 -0
  70. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BlaenauGwentCountyBoroughCouncil.py +0 -0
  71. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BolsoverCouncil.py +0 -0
  72. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BoltonCouncil.py +0 -0
  73. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BostonBoroughCouncil.py +0 -0
  74. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BracknellForestCouncil.py +0 -0
  75. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BradfordMDC.py +0 -0
  76. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BraintreeDistrictCouncil.py +0 -0
  77. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BrecklandCouncil.py +0 -0
  78. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BrentCouncil.py +0 -0
  79. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BrightonandHoveCityCouncil.py +0 -0
  80. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BristolCityCouncil.py +0 -0
  81. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BroadlandDistrictCouncil.py +0 -0
  82. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BromleyBoroughCouncil.py +0 -0
  83. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BromsgroveDistrictCouncil.py +0 -0
  84. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BroxbourneCouncil.py +0 -0
  85. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BroxtoweBoroughCouncil.py +0 -0
  86. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BuckinghamshireCouncil.py +0 -0
  87. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BurnleyBoroughCouncil.py +0 -0
  88. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/BuryCouncil.py +0 -0
  89. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/CalderdaleCouncil.py +0 -0
  90. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/CambridgeCityCouncil.py +0 -0
  91. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/CannockChaseDistrictCouncil.py +0 -0
  92. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/CanterburyCityCouncil.py +0 -0
  93. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/CardiffCouncil.py +0 -0
  94. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/CarmarthenshireCountyCouncil.py +0 -0
  95. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/CastlepointDistrictCouncil.py +0 -0
  96. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/CeredigionCountyCouncil.py +0 -0
  97. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/CharnwoodBoroughCouncil.py +0 -0
  98. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/ChelmsfordCityCouncil.py +0 -0
  99. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/CheltenhamBoroughCouncil.py +0 -0
  100. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/CherwellDistrictCouncil.py +0 -0
  101. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/CheshireEastCouncil.py +0 -0
  102. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/CheshireWestAndChesterCouncil.py +0 -0
  103. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/ChesterfieldBoroughCouncil.py +0 -0
  104. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/ChichesterDistrictCouncil.py +0 -0
  105. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/ChorleyCouncil.py +0 -0
  106. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/ColchesterCityCouncil.py +0 -0
  107. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/ConwyCountyBorough.py +0 -0
  108. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/CopelandBoroughCouncil.py +0 -0
  109. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/CornwallCouncil.py +0 -0
  110. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/CotswoldDistrictCouncil.py +0 -0
  111. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/CoventryCityCouncil.py +0 -0
  112. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/CrawleyBoroughCouncil.py +0 -0
  113. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/CroydonCouncil.py +0 -0
  114. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/CumberlandAllerdaleCouncil.py +0 -0
  115. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/CumberlandCouncil.py +0 -0
  116. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/DarlingtonBoroughCouncil.py +0 -0
  117. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/DartfordBoroughCouncil.py +0 -0
  118. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/DenbighshireCouncil.py +0 -0
  119. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/DerbyCityCouncil.py +0 -0
  120. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/DerbyshireDalesDistrictCouncil.py +0 -0
  121. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/DoncasterCouncil.py +0 -0
  122. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/DorsetCouncil.py +0 -0
  123. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/DoverDistrictCouncil.py +0 -0
  124. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/DudleyCouncil.py +0 -0
  125. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/DundeeCityCouncil.py +0 -0
  126. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/DurhamCouncil.py +0 -0
  127. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/EalingCouncil.py +0 -0
  128. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/EastAyrshireCouncil.py +0 -0
  129. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/EastCambridgeshireCouncil.py +0 -0
  130. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/EastDevonDC.py +0 -0
  131. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/EastHertsCouncil.py +0 -0
  132. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/EastLindseyDistrictCouncil.py +0 -0
  133. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/EastLothianCouncil.py +0 -0
  134. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/EastRenfrewshireCouncil.py +0 -0
  135. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/EastRidingCouncil.py +0 -0
  136. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/EastStaffordshireBoroughCouncil.py +0 -0
  137. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/EastSuffolkCouncil.py +0 -0
  138. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/EastbourneBoroughCouncil.py +0 -0
  139. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/EastleighBoroughCouncil.py +0 -0
  140. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/EdinburghCityCouncil.py +0 -0
  141. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/ElmbridgeBoroughCouncil.py +0 -0
  142. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/EnfieldCouncil.py +0 -0
  143. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/EnvironmentFirst.py +0 -0
  144. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/EppingForestDistrictCouncil.py +0 -0
  145. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/EpsomandEwellBoroughCouncil.py +0 -0
  146. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/ErewashBoroughCouncil.py +0 -0
  147. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/ExeterCityCouncil.py +0 -0
  148. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/FalkirkCouncil.py +0 -0
  149. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/FarehamBoroughCouncil.py +0 -0
  150. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/FenlandDistrictCouncil.py +0 -0
  151. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/FermanaghOmaghDistrictCouncil.py +0 -0
  152. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/FifeCouncil.py +0 -0
  153. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/FlintshireCountyCouncil.py +0 -0
  154. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/FolkstoneandHytheDistrictCouncil.py +0 -0
  155. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/ForestOfDeanDistrictCouncil.py +0 -0
  156. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/FyldeCouncil.py +0 -0
  157. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/GatesheadCouncil.py +0 -0
  158. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/GedlingBoroughCouncil.py +0 -0
  159. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/GlasgowCityCouncil.py +0 -0
  160. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/GloucesterCityCouncil.py +0 -0
  161. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/GooglePublicCalendarCouncil.py +0 -0
  162. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/GraveshamBoroughCouncil.py +0 -0
  163. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/GreatYarmouthBoroughCouncil.py +0 -0
  164. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/GuildfordCouncil.py +0 -0
  165. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/GwyneddCouncil.py +0 -0
  166. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/HackneyCouncil.py +0 -0
  167. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/HaltonBoroughCouncil.py +0 -0
  168. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/HarboroughDistrictCouncil.py +0 -0
  169. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/HaringeyCouncil.py +0 -0
  170. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/HarrogateBoroughCouncil.py +0 -0
  171. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/HartDistrictCouncil.py +0 -0
  172. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/HartlepoolBoroughCouncil.py +0 -0
  173. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/HastingsBoroughCouncil.py +0 -0
  174. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/HerefordshireCouncil.py +0 -0
  175. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/HertsmereBoroughCouncil.py +0 -0
  176. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/HighPeakCouncil.py +0 -0
  177. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/HighlandCouncil.py +0 -0
  178. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/Hillingdon.py +0 -0
  179. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/HinckleyandBosworthBoroughCouncil.py +0 -0
  180. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/HorshamDistrictCouncil.py +0 -0
  181. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/HullCityCouncil.py +0 -0
  182. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/HuntingdonDistrictCouncil.py +0 -0
  183. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/HyndburnBoroughCouncil.py +0 -0
  184. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/IpswichBoroughCouncil.py +0 -0
  185. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/KingsLynnandWestNorfolkBC.py +0 -0
  186. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/KingstonUponThamesCouncil.py +0 -0
  187. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/KirkleesCouncil.py +0 -0
  188. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/KnowsleyMBCouncil.py +0 -0
  189. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/LeedsCityCouncil.py +0 -0
  190. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/LeicesterCityCouncil.py +0 -0
  191. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/LewesDistrictCouncil.py +0 -0
  192. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/LichfieldDistrictCouncil.py +0 -0
  193. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/LincolnCouncil.py +0 -0
  194. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/LisburnCastlereaghCityCouncil.py +0 -0
  195. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/LiverpoolCityCouncil.py +0 -0
  196. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/LondonBoroughEaling.py +0 -0
  197. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/LondonBoroughHarrow.py +0 -0
  198. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/LondonBoroughHavering.py +0 -0
  199. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/LondonBoroughHounslow.py +0 -0
  200. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/LondonBoroughLambeth.py +0 -0
  201. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/LondonBoroughLewisham.py +0 -0
  202. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/LondonBoroughOfRichmondUponThames.py +0 -0
  203. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/LondonBoroughRedbridge.py +0 -0
  204. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/LondonBoroughSutton.py +0 -0
  205. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/LutonBoroughCouncil.py +0 -0
  206. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/MaidstoneBoroughCouncil.py +0 -0
  207. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/MaldonDistrictCouncil.py +0 -0
  208. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/MalvernHillsDC.py +0 -0
  209. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/ManchesterCityCouncil.py +0 -0
  210. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/MansfieldDistrictCouncil.py +0 -0
  211. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/MedwayCouncil.py +0 -0
  212. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/MeltonBoroughCouncil.py +0 -0
  213. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/MertonCouncil.py +0 -0
  214. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/MidAndEastAntrimBoroughCouncil.py +0 -0
  215. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/MidDevonCouncil.py +0 -0
  216. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/MidSussexDistrictCouncil.py +0 -0
  217. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/MidUlsterDistrictCouncil.py +0 -0
  218. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/MiddlesbroughCouncil.py +0 -0
  219. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/MidlothianCouncil.py +0 -0
  220. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/MiltonKeynesCityCouncil.py +0 -0
  221. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/MoleValleyDistrictCouncil.py +0 -0
  222. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/MonmouthshireCountyCouncil.py +0 -0
  223. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/MorayCouncil.py +0 -0
  224. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/NeathPortTalbotCouncil.py +0 -0
  225. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/NewarkAndSherwoodDC.py +0 -0
  226. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/NewcastleCityCouncil.py +0 -0
  227. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/NewcastleUnderLymeCouncil.py +0 -0
  228. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/NewhamCouncil.py +0 -0
  229. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/NorthAyrshireCouncil.py +0 -0
  230. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/NorthDevonCountyCouncil.py +0 -0
  231. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/NorthEastDerbyshireDistrictCouncil.py +0 -0
  232. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/NorthEastLincs.py +0 -0
  233. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/NorthHertfordshireDistrictCouncil.py +0 -0
  234. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/NorthKestevenDistrictCouncil.py +0 -0
  235. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/NorthLanarkshireCouncil.py +0 -0
  236. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/NorthLincolnshireCouncil.py +0 -0
  237. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/NorthNorfolkDistrictCouncil.py +0 -0
  238. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/NorthNorthamptonshireCouncil.py +0 -0
  239. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/NorthSomersetCouncil.py +0 -0
  240. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/NorthTynesideCouncil.py +0 -0
  241. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/NorthWestLeicestershire.py +0 -0
  242. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/NorthYorkshire.py +0 -0
  243. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/NorwichCityCouncil.py +0 -0
  244. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/NottinghamCityCouncil.py +0 -0
  245. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/NuneatonBedworthBoroughCouncil.py +0 -0
  246. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/OadbyAndWigstonBoroughCouncil.py +0 -0
  247. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/OldhamCouncil.py +0 -0
  248. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/PembrokeshireCountyCouncil.py +0 -0
  249. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/PerthAndKinrossCouncil.py +0 -0
  250. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/PeterboroughCityCouncil.py +0 -0
  251. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/PlymouthCouncil.py +0 -0
  252. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/PortsmouthCityCouncil.py +0 -0
  253. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/PowysCouncil.py +0 -0
  254. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/PrestonCityCouncil.py +0 -0
  255. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/ReadingBoroughCouncil.py +0 -0
  256. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/RedcarandClevelandCouncil.py +0 -0
  257. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/RedditchBoroughCouncil.py +0 -0
  258. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/ReigateAndBansteadBoroughCouncil.py +0 -0
  259. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/RhonddaCynonTaffCouncil.py +0 -0
  260. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/RochdaleCouncil.py +0 -0
  261. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/RochfordCouncil.py +0 -0
  262. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/RotherDistrictCouncil.py +0 -0
  263. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/RoyalBoroughofGreenwich.py +0 -0
  264. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/RugbyBoroughCouncil.py +0 -0
  265. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/RunnymedeBoroughCouncil.py +0 -0
  266. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/RushcliffeBoroughCouncil.py +0 -0
  267. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/RushmoorCouncil.py +0 -0
  268. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SalfordCityCouncil.py +0 -0
  269. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SandwellBoroughCouncil.py +0 -0
  270. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SeftonCouncil.py +0 -0
  271. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SevenoaksDistrictCouncil.py +0 -0
  272. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SheffieldCityCouncil.py +0 -0
  273. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/ShropshireCouncil.py +0 -0
  274. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SloughBoroughCouncil.py +0 -0
  275. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SolihullCouncil.py +0 -0
  276. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SouthAyrshireCouncil.py +0 -0
  277. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SouthCambridgeshireCouncil.py +0 -0
  278. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SouthDerbyshireDistrictCouncil.py +0 -0
  279. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SouthHamsDistrictCouncil.py +0 -0
  280. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SouthHollandDistrictCouncil.py +0 -0
  281. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SouthKestevenDistrictCouncil.py +0 -0
  282. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SouthLanarkshireCouncil.py +0 -0
  283. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SouthNorfolkCouncil.py +0 -0
  284. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SouthOxfordshireCouncil.py +0 -0
  285. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SouthRibbleCouncil.py +0 -0
  286. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SouthStaffordshireDistrictCouncil.py +0 -0
  287. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SouthTynesideCouncil.py +0 -0
  288. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SouthamptonCityCouncil.py +0 -0
  289. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SouthwarkCouncil.py +0 -0
  290. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SpelthorneBoroughCouncil.py +0 -0
  291. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/StAlbansCityAndDistrictCouncil.py +0 -0
  292. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/StHelensBC.py +0 -0
  293. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/StaffordBoroughCouncil.py +0 -0
  294. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/StaffordshireMoorlandsDistrictCouncil.py +0 -0
  295. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/StevenageBoroughCouncil.py +0 -0
  296. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/StirlingCouncil.py +0 -0
  297. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/StockportBoroughCouncil.py +0 -0
  298. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/StocktonOnTeesCouncil.py +0 -0
  299. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/StokeOnTrentCityCouncil.py +0 -0
  300. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/StratfordUponAvonCouncil.py +0 -0
  301. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/StroudDistrictCouncil.py +0 -0
  302. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SunderlandCityCouncil.py +0 -0
  303. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SurreyHeathBoroughCouncil.py +0 -0
  304. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SwaleBoroughCouncil.py +0 -0
  305. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SwanseaCouncil.py +0 -0
  306. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/SwindonBoroughCouncil.py +0 -0
  307. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/TamesideMBCouncil.py +0 -0
  308. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/TandridgeDistrictCouncil.py +0 -0
  309. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/TeignbridgeCouncil.py +0 -0
  310. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/TelfordAndWrekinCouncil.py +0 -0
  311. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/TendringDistrictCouncil.py +0 -0
  312. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/TewkesburyBoroughCouncil.py +0 -0
  313. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/ThanetDistrictCouncil.py +0 -0
  314. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/ThreeRiversDistrictCouncil.py +0 -0
  315. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/ThurrockCouncil.py +0 -0
  316. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/TonbridgeAndMallingBC.py +0 -0
  317. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/TorbayCouncil.py +0 -0
  318. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/TorridgeDistrictCouncil.py +0 -0
  319. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/TunbridgeWellsCouncil.py +0 -0
  320. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/UttlesfordDistrictCouncil.py +0 -0
  321. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/ValeofGlamorganCouncil.py +0 -0
  322. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/ValeofWhiteHorseCouncil.py +0 -0
  323. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WakefieldCityCouncil.py +0 -0
  324. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WalsallCouncil.py +0 -0
  325. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WalthamForest.py +0 -0
  326. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WandsworthCouncil.py +0 -0
  327. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WarringtonBoroughCouncil.py +0 -0
  328. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WarwickDistrictCouncil.py +0 -0
  329. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WatfordBoroughCouncil.py +0 -0
  330. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WaverleyBoroughCouncil.py +0 -0
  331. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WealdenDistrictCouncil.py +0 -0
  332. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WelhatCouncil.py +0 -0
  333. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WestBerkshireCouncil.py +0 -0
  334. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WestDunbartonshireCouncil.py +0 -0
  335. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WestLancashireBoroughCouncil.py +0 -0
  336. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WestLindseyDistrictCouncil.py +0 -0
  337. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WestLothianCouncil.py +0 -0
  338. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WestMorlandAndFurness.py +0 -0
  339. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WestNorthamptonshireCouncil.py +0 -0
  340. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WestOxfordshireDistrictCouncil.py +0 -0
  341. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WestSuffolkCouncil.py +0 -0
  342. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WiganBoroughCouncil.py +0 -0
  343. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WiltshireCouncil.py +0 -0
  344. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WinchesterCityCouncil.py +0 -0
  345. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WindsorAndMaidenheadCouncil.py +0 -0
  346. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WirralCouncil.py +0 -0
  347. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WokingBoroughCouncil.py +0 -0
  348. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WokinghamBoroughCouncil.py +0 -0
  349. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WolverhamptonCityCouncil.py +0 -0
  350. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WorcesterCityCouncil.py +0 -0
  351. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WrexhamCountyBoroughCouncil.py +0 -0
  352. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WychavonDistrictCouncil.py +0 -0
  353. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WyreCouncil.py +0 -0
  354. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/WyreForestDistrictCouncil.py +0 -0
  355. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/YorkCouncil.py +0 -0
  356. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/councils/council_class_template/councilclasstemplate.py +0 -0
  357. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/create_new_council.py +0 -0
  358. {uk_bin_collection-0.154.0 → uk_bin_collection-0.157.0}/uk_bin_collection/uk_bin_collection/get_bin_data.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: uk_bin_collection
3
- Version: 0.154.0
3
+ Version: 0.157.0
4
4
  Summary: Python Lib to collect UK Bin Data
5
5
  Author: Robert Bradley
6
6
  Author-email: robbrad182@gmail.com
@@ -1,6 +1,6 @@
1
1
  [tool.poetry]
2
2
  name = "uk_bin_collection"
3
- version = "0.154.0"
3
+ version = "0.157.0"
4
4
  description = "Python Lib to collect UK Bin Data"
5
5
  readme = "README.md"
6
6
  authors = ["Robert Bradley <robbrad182@gmail.com>"]
@@ -65,9 +65,13 @@ tabulate = "^0.9.0"
65
65
  icalevents = "^0.2.1"
66
66
 
67
67
  [tool.commitizen]
68
- major_version_zero = true
68
+ name = "cz_conventional_commits"
69
69
  version_provider = "poetry"
70
70
  version_scheme = "semver"
71
+ major_version_zero = true
72
+ tag_format = "$version"
73
+ update_changelog_on_bump = true
74
+ annotated_tag = true
71
75
  version_files = [
72
76
  "custom_components/uk_bin_collection/manifest.json:version",
73
77
  "custom_components/uk_bin_collection/manifest.json:requirements",
@@ -760,6 +760,13 @@
760
760
  "wiki_note": "Pass the UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search).",
761
761
  "LAD24CD": "E07000040"
762
762
  },
763
+ "EastDunbartonshireCouncil": {
764
+ "uprn": "132027197",
765
+ "url": "https://www.eastdunbarton.gov.uk/",
766
+ "wiki_name": "East Dunbartonshire",
767
+ "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN.",
768
+ "LAD24CD": "S12000045"
769
+ },
763
770
  "EastHertsCouncil": {
764
771
  "LAD24CD": "E07000097",
765
772
  "skip_get_url": true,
@@ -1608,7 +1615,7 @@
1608
1615
  "postcode": "SO41 0GJ",
1609
1616
  "skip_get_url": true,
1610
1617
  "uprn": "100060482345",
1611
- "url": "https://forms.newforest.gov.uk/id/FIND_MY_COLLECTION",
1618
+ "url": "https://forms.newforest.gov.uk/ufs/FIND_MY_BIN_BAR.eb",
1612
1619
  "web_driver": "http://selenium:4444",
1613
1620
  "wiki_name": "New Forest",
1614
1621
  "wiki_note": "Pass the postcode and UPRN. This parser requires a Selenium webdriver.",
@@ -1647,10 +1654,11 @@
1647
1654
  "NewportCityCouncil": {
1648
1655
  "postcode": "NP20 4HE",
1649
1656
  "skip_get_url": true,
1650
- "uprn": "100100688837",
1657
+ "house_number": "6",
1651
1658
  "url": "https://www.newport.gov.uk/",
1659
+ "web_driver": "http://selenium:4444",
1652
1660
  "wiki_name": "Newport",
1653
- "wiki_note": "Pass the postcode and UPRN. You can find the UPRN using [FindMyAddress](https://www.findmyaddress.co.uk/search).",
1661
+ "wiki_note": "Pass the postcode and house number in their respective arguments, both wrapped in quotes.",
1654
1662
  "LAD24CD": "W06000022"
1655
1663
  },
1656
1664
  "NorthAyrshireCouncil": {
@@ -2087,10 +2095,11 @@
2087
2095
  "SomersetCouncil": {
2088
2096
  "postcode": "TA6 4AA",
2089
2097
  "skip_get_url": true,
2090
- "uprn": "10090857775",
2098
+ "house_number": "5",
2091
2099
  "url": "https://www.somerset.gov.uk/",
2100
+ "web_driver": "http://selenium:4444",
2092
2101
  "wiki_name": "Somerset",
2093
- "wiki_note": "Provide your UPRN and postcode. Find your UPRN using [FindMyAddress](https://www.findmyaddress.co.uk/search).",
2102
+ "wiki_note": "Provide your house number and postcode",
2094
2103
  "LAD24CD": "E06000066"
2095
2104
  },
2096
2105
  "SouthAyrshireCouncil": {
@@ -2122,7 +2131,7 @@
2122
2131
  "SouthGloucestershireCouncil": {
2123
2132
  "skip_get_url": true,
2124
2133
  "uprn": "566419",
2125
- "url": "https://beta.southglos.gov.uk/waste-and-recycling-collection-date",
2134
+ "url": "https://api.southglos.gov.uk/wastecomp/GetCollectionDetails",
2126
2135
  "wiki_name": "South Gloucestershire",
2127
2136
  "wiki_note": "Provide your UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search).",
2128
2137
  "LAD24CD": "E06000025"
@@ -2415,12 +2424,13 @@
2415
2424
  "LAD24CD": "E07000076"
2416
2425
  },
2417
2426
  "TestValleyBoroughCouncil": {
2418
- "postcode": "SO51 9ZD",
2427
+ "postcode": "SO51 0BY",
2419
2428
  "skip_get_url": true,
2420
- "uprn": "200010012019",
2421
- "url": "https://testvalley.gov.uk/wasteandrecycling/when-are-my-bins-collected",
2429
+ "house_number": "2",
2430
+ "url": "https://testvalley.gov.uk/wasteandrecycling/when-are-my-bins-collected/when-are-my-bins-collected",
2431
+ "web_driver": "http://selenium:4444",
2422
2432
  "wiki_name": "Test Valley",
2423
- "wiki_note": "Provide your UPRN and postcode. Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN.",
2433
+ "wiki_note": "Provide your house number and postcode",
2424
2434
  "LAD24CD": "E07000093"
2425
2435
  },
2426
2436
  "ThanetDistrictCouncil": {
@@ -2463,6 +2473,7 @@
2463
2473
  "skip_get_url": true,
2464
2474
  "uprn": "10000016984",
2465
2475
  "postcode": "TQ1 1AG",
2476
+ "web_driver": "http://selenium:4444",
2466
2477
  "url": "https://www.torbay.gov.uk/recycling/bin-collections/",
2467
2478
  "wiki_name": "Torbay",
2468
2479
  "wiki_note": "Provide your UPRN. Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find it.",
@@ -5,7 +5,6 @@ import requests
5
5
  from uk_bin_collection.uk_bin_collection.common import *
6
6
  from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
7
7
 
8
-
9
8
  # import the wonderful Beautiful Soup and the URL grabber
10
9
  class CouncilClass(AbstractGetBinDataClass):
11
10
  """
@@ -76,19 +76,28 @@ class CouncilClass(AbstractGetBinDataClass):
76
76
  )
77
77
 
78
78
  for Collection in NextCollections:
79
- BinType = Collection.find("strong").text.strip()
80
- if BinType:
81
- CollectionDate = datetime.strptime(
82
- Collection.find_all("div", {"style": "display:table-cell;"})[1]
83
- .get_text()
84
- .strip(),
85
- "%a, %d %b %Y",
86
- )
87
- dict_data = {
88
- "type": BinType,
89
- "collectionDate": CollectionDate.strftime("%d/%m/%Y"),
90
- }
91
- data["bins"].append(dict_data)
79
+ strong_element = Collection.find("strong")
80
+ if strong_element:
81
+ BinType = strong_element.text.strip()
82
+ # Skip if this is not a bin type (e.g., informational text)
83
+ if BinType and not any(skip_text in BinType.lower() for skip_text in
84
+ ["please note", "we may collect", "bank holiday", "different day"]):
85
+ date_cells = Collection.find_all("div", {"style": "display:table-cell;"})
86
+ if len(date_cells) > 1:
87
+ date_text = date_cells[1].get_text().strip()
88
+ if date_text:
89
+ try:
90
+ CollectionDate = datetime.strptime(date_text, "%a, %d %b %Y")
91
+ dict_data = {
92
+ "type": BinType,
93
+ "collectionDate": CollectionDate.strftime("%d/%m/%Y"),
94
+ }
95
+ # Check for duplicates before adding
96
+ if dict_data not in data["bins"]:
97
+ data["bins"].append(dict_data)
98
+ except ValueError:
99
+ # Skip if date parsing fails
100
+ continue
92
101
 
93
102
  except Exception as e:
94
103
  # Here you can log the exception if needed
@@ -0,0 +1,52 @@
1
+ import requests
2
+ from bs4 import BeautifulSoup, Tag
3
+
4
+ from uk_bin_collection.uk_bin_collection.common import *
5
+ from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
6
+
7
+
8
+ # import the wonderful Beautiful Soup and the URL grabber
9
+ class CouncilClass(AbstractGetBinDataClass):
10
+ """
11
+ Concrete classes have to implement all abstract operations of the
12
+ base class. They can also override some operations with a default
13
+ implementation.
14
+ """
15
+
16
+ def parse_data(self, page: str, **kwargs) -> dict:
17
+
18
+ user_uprn = kwargs.get("uprn")
19
+ check_uprn(user_uprn)
20
+ bindata = {"bins": []}
21
+
22
+ URI = f"https://www.eastdunbarton.gov.uk/services/a-z-of-services/bins-waste-and-recycling/bins-and-recycling/collections/?uprn={user_uprn}"
23
+
24
+ # Make the GET request
25
+ response = requests.get(URI)
26
+
27
+ soup = BeautifulSoup(response.text, "html.parser")
28
+
29
+ table = soup.find("table", {"class": "bin-table"})
30
+
31
+ tbody = table.find("tbody")
32
+
33
+ trs = tbody.find_all("tr")
34
+
35
+ for tr in trs:
36
+ tds = tr.find_all("td")
37
+ bin_type = tds[0].get_text()
38
+ collection_date_str = tds[1].find("span").get_text()
39
+
40
+ collection_date = datetime.strptime(collection_date_str, "%A, %d %B %Y")
41
+
42
+ dict_data = {
43
+ "type": bin_type,
44
+ "collectionDate": collection_date.strftime(date_format),
45
+ }
46
+ bindata["bins"].append(dict_data)
47
+
48
+ bindata["bins"].sort(
49
+ key=lambda x: datetime.strptime(x.get("collectionDate"), date_format)
50
+ )
51
+
52
+ return bindata
@@ -17,11 +17,14 @@ class CouncilClass(AbstractGetBinDataClass):
17
17
 
18
18
  data = {"bins": []}
19
19
 
20
- waste_table = (
21
- soup.find(string="Waste and recycling collections")
22
- .find_next("div", class_="m-toggle-content")
23
- .find("table")
24
- )
20
+ # Find the waste and recycling section with proper null checking
21
+ waste_section = soup.find(string="Waste and recycling collections")
22
+ waste_table = None
23
+
24
+ if waste_section:
25
+ toggle_content = waste_section.find_next("div", class_="m-toggle-content")
26
+ if toggle_content:
27
+ waste_table = toggle_content.find("table")
25
28
 
26
29
  if waste_table:
27
30
  rows = waste_table.find_all("tr")
@@ -57,17 +57,30 @@ class CouncilClass(AbstractGetBinDataClass):
57
57
  response = session.get(addr_link)
58
58
  new_soup = BeautifulSoup(response.text, features="html.parser")
59
59
  services = new_soup.find("section", {"id": "scheduled-collections"})
60
+
61
+ if services is None:
62
+ raise Exception("Could not find scheduled collections section on the page")
63
+
60
64
  services_sub = services.find_all("li")
65
+ if not services_sub:
66
+ raise Exception("No collection services found")
67
+
61
68
  for i in range(0, len(services_sub), 3):
62
- dt = datetime.strptime(services_sub[i + 1].text.strip(), "%d/%m/%Y").date()
63
- bin_type = BeautifulSoup(services_sub[i + 2].text, features="lxml").find(
64
- "p"
65
- )
66
- data["bins"].append(
67
- {
68
- "type": bin_type.text.strip().removesuffix(" Collection Service"),
69
- "collectionDate": dt.strftime(date_format),
70
- }
71
- )
69
+ if i + 2 < len(services_sub):
70
+ date_text = services_sub[i + 1].text.strip() if services_sub[i + 1] else None
71
+ if date_text:
72
+ try:
73
+ dt = datetime.strptime(date_text, "%d/%m/%Y").date()
74
+ bin_type_element = BeautifulSoup(services_sub[i + 2].text, features="lxml").find("p")
75
+ if bin_type_element and bin_type_element.text:
76
+ data["bins"].append(
77
+ {
78
+ "type": bin_type_element.text.strip().removesuffix(" Collection Service"),
79
+ "collectionDate": dt.strftime(date_format),
80
+ }
81
+ )
82
+ except (ValueError, AttributeError) as e:
83
+ # Skip invalid date or missing elements
84
+ continue
72
85
 
73
86
  return data
@@ -0,0 +1,174 @@
1
+ import re
2
+ import time
3
+
4
+ import holidays
5
+ import requests
6
+ from bs4 import BeautifulSoup
7
+ from selenium.webdriver.common.by import By
8
+ from selenium.webdriver.support import expected_conditions as EC
9
+ from selenium.webdriver.support.ui import Select
10
+ from selenium.webdriver.support.wait import WebDriverWait
11
+
12
+ from uk_bin_collection.uk_bin_collection.common import *
13
+ from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
14
+
15
+
16
+ # import the wonderful Beautiful Soup and the URL grabber
17
+ class CouncilClass(AbstractGetBinDataClass):
18
+ """
19
+ Concrete classes have to implement all abstract operations of the
20
+ base class. They can also override some operations with a default
21
+ implementation.
22
+ """
23
+
24
+ def parse_data(self, page: str, **kwargs) -> dict:
25
+
26
+ collection_day = kwargs.get("paon")
27
+ garden_collection_week = kwargs.get("postcode")
28
+ garden_collection_day = kwargs.get("uprn")
29
+ bindata = {"bins": []}
30
+
31
+ days_of_week = [
32
+ "Monday",
33
+ "Tuesday",
34
+ "Wednesday",
35
+ "Thursday",
36
+ "Friday",
37
+ "Saturday",
38
+ "Sunday",
39
+ ]
40
+
41
+ garden_week = ["Week 1", "Week 2"]
42
+
43
+ refusestartDate = datetime(2024, 11, 11)
44
+ recyclingstartDate = datetime(2024, 11, 4)
45
+
46
+ offset_days = days_of_week.index(collection_day)
47
+ offset_days_garden = days_of_week.index(garden_collection_day)
48
+ if garden_collection_week:
49
+ garden_collection = garden_week.index(garden_collection_week)
50
+
51
+ refuse_dates = get_dates_every_x_days(refusestartDate, 14, 28)
52
+ recycling_dates = get_dates_every_x_days(recyclingstartDate, 14, 28)
53
+
54
+ # Generate bank holidays dynamically using the holidays library
55
+ def get_bank_holidays_set():
56
+ """Get set of bank holiday dates for quick lookup."""
57
+ current_year = datetime.now().year
58
+ uk_holidays = holidays.UK(years=range(current_year - 1, current_year + 3))
59
+ return set(uk_holidays.keys())
60
+
61
+ def find_next_collection_day(original_date):
62
+ """Find the next valid collection day, avoiding weekends and bank holidays."""
63
+ bank_holiday_dates = get_bank_holidays_set()
64
+ check_date = datetime.strptime(original_date, "%d/%m/%Y")
65
+
66
+ # Safety limit to prevent infinite loops
67
+ max_attempts = 10
68
+ attempts = 0
69
+
70
+ # Keep moving forward until we find a valid collection day
71
+ while attempts < max_attempts:
72
+ attempts += 1
73
+
74
+ # Check if it's a weekend (Saturday=5, Sunday=6)
75
+ if check_date.weekday() >= 5:
76
+ check_date += timedelta(days=1)
77
+ continue
78
+
79
+ # Check if it's a bank holiday
80
+ if check_date.date() in bank_holiday_dates:
81
+ # Major holidays (Christmas/New Year) get bigger delays
82
+ holiday_name = str(holidays.UK().get(check_date.date(), ''))
83
+ is_major_holiday = (
84
+ 'Christmas' in holiday_name or
85
+ 'Boxing' in holiday_name or
86
+ 'New Year' in holiday_name
87
+ )
88
+ delay_days = 2 if is_major_holiday else 1
89
+ check_date += timedelta(days=delay_days)
90
+ continue
91
+
92
+ # Found a valid collection day
93
+ break
94
+
95
+ # If we've exhausted attempts, return the original date as fallback
96
+ if attempts >= max_attempts:
97
+ return original_date
98
+
99
+ return check_date.strftime("%d/%m/%Y")
100
+
101
+ bank_holidays = [] # No longer needed - using smart date calculation
102
+
103
+ for refuseDate in refuse_dates:
104
+ # Calculate initial collection date
105
+ initial_date = (
106
+ datetime.strptime(refuseDate, "%d/%m/%Y") + timedelta(days=offset_days)
107
+ ).strftime("%d/%m/%Y")
108
+
109
+ # Find the next valid collection day (handles weekends + cascading holidays)
110
+ collection_date = find_next_collection_day(initial_date)
111
+
112
+ dict_data = {
113
+ "type": "Refuse Bin",
114
+ "collectionDate": collection_date,
115
+ }
116
+ bindata["bins"].append(dict_data)
117
+
118
+ for recyclingDate in recycling_dates:
119
+ # Calculate initial collection date
120
+ initial_date = (
121
+ datetime.strptime(recyclingDate, "%d/%m/%Y")
122
+ + timedelta(days=offset_days)
123
+ ).strftime("%d/%m/%Y")
124
+
125
+ # Find the next valid collection day (handles weekends + cascading holidays)
126
+ collection_date = find_next_collection_day(initial_date)
127
+
128
+ dict_data = {
129
+ "type": "Recycling Bin",
130
+ "collectionDate": collection_date,
131
+ }
132
+ bindata["bins"].append(dict_data)
133
+
134
+ if garden_collection_week:
135
+ if garden_collection == 0:
136
+ gardenstartDate = datetime(2024, 11, 11)
137
+ elif garden_collection == 1:
138
+ gardenstartDate = datetime(2024, 11, 4)
139
+
140
+ garden_dates = get_dates_every_x_days(gardenstartDate, 14, 28)
141
+
142
+ def is_christmas_period(date_obj):
143
+ """Check if date is in Christmas/New Year skip period for garden collections."""
144
+ if date_obj.month == 12 and date_obj.day >= 23:
145
+ return True
146
+ if date_obj.month == 1 and date_obj.day <= 3:
147
+ return True
148
+ return False
149
+
150
+ for gardenDate in garden_dates:
151
+ # Calculate initial collection date
152
+ initial_date = (
153
+ datetime.strptime(gardenDate, "%d/%m/%Y")
154
+ + timedelta(days=offset_days_garden)
155
+ )
156
+
157
+ # Skip garden collections during Christmas/New Year period
158
+ if is_christmas_period(initial_date):
159
+ continue
160
+
161
+ # Find the next valid collection day (handles weekends + holidays)
162
+ collection_date = find_next_collection_day(initial_date.strftime("%d/%m/%Y"))
163
+
164
+ dict_data = {
165
+ "type": "Garden Bin",
166
+ "collectionDate": collection_date,
167
+ }
168
+ bindata["bins"].append(dict_data)
169
+
170
+ bindata["bins"].sort(
171
+ key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y")
172
+ )
173
+
174
+ return bindata
@@ -0,0 +1,201 @@
1
+ import logging
2
+ import time
3
+
4
+ from bs4 import BeautifulSoup
5
+ from selenium import webdriver
6
+ from selenium.common.exceptions import NoSuchElementException
7
+ from selenium.webdriver.common.by import By
8
+ from selenium.webdriver.common.keys import Keys
9
+ from selenium.webdriver.support import expected_conditions as EC
10
+ from selenium.webdriver.support.ui import Select
11
+ from selenium.webdriver.support.wait import WebDriverWait
12
+
13
+ from uk_bin_collection.uk_bin_collection.common import *
14
+ from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
15
+
16
+ # Set up logging
17
+ logging.basicConfig(
18
+ level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s"
19
+ )
20
+
21
+
22
+ class CouncilClass(AbstractGetBinDataClass):
23
+
24
+ def get_legacy_bins(self, page: str) -> []:
25
+
26
+ logging.info("Extracting legacy bin collection data")
27
+ soup = BeautifulSoup(page, features="html.parser")
28
+ legacy_bins = []
29
+
30
+ # Rubbish and recycling
31
+ rubbish_recycling = soup.find(
32
+ "span", class_="CTID-77-_ eb-77-Override-textControl"
33
+ )
34
+ if rubbish_recycling:
35
+ match = re.search(r"collected weekly on (\w+)", rubbish_recycling.text)
36
+ if match:
37
+ day_name = match.group(1)
38
+ next_collection = get_next_day_of_week(day_name)
39
+ legacy_bins.append(
40
+ {
41
+ "type": "Rubbish and recycling",
42
+ "collectionDate": next_collection,
43
+ }
44
+ )
45
+ logging.info(f"Rubbish and Recycling: {str(next_collection)}")
46
+
47
+ # Glass collection
48
+ glass_collection = soup.find("span", class_="CTID-78-_ eb-78-textControl")
49
+ if glass_collection:
50
+ match = re.search(
51
+ r"next collection is\s+(\d{2}/\d{2}/\d{4})", glass_collection.text
52
+ )
53
+ if match:
54
+ legacy_bins.append(
55
+ {"type": "Glass collection", "collectionDate": match.group(1)}
56
+ )
57
+ logging.info(f"Glass: {str(match.group(1))}")
58
+
59
+ # Garden waste
60
+ garden_waste = soup.find("div", class_="eb-2HIpCnWC-Override-EditorInput")
61
+ if garden_waste:
62
+ match = re.search(r"(\d{2}/\d{2}/\d{4})", garden_waste.text)
63
+ if match:
64
+ legacy_bins.append(
65
+ {"type": "Garden waste", "collectionDate": match.group(1)}
66
+ )
67
+ logging.info(f"Garden: {str(match.group(1))}")
68
+
69
+ # return bins
70
+ return legacy_bins
71
+
72
+ def parse_data(self, page: str, **kwargs) -> dict:
73
+ driver = None
74
+ try:
75
+ bins = []
76
+ user_uprn = kwargs.get("uprn")
77
+ user_postcode = kwargs.get("postcode")
78
+ web_driver = kwargs.get("web_driver")
79
+ headless = kwargs.get("headless")
80
+ check_postcode(user_postcode)
81
+ url = "https://forms.newforest.gov.uk/ufs/FIND_MY_BIN_BAR.eb"
82
+
83
+ # Get session cookies using requests
84
+
85
+ user_agent = """general.useragent.override", "userAgent=Mozilla/5.0
86
+ (iPhone; CPU iPhone OS 15_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like
87
+ Gecko) CriOS/101.0.4951.44 Mobile/15E148 Safari/604.1"""
88
+
89
+ # Create Selenium webdriver
90
+ driver = create_webdriver(web_driver, headless, user_agent, __name__)
91
+
92
+ # Navigate to the page first
93
+ driver.get(url)
94
+ driver.refresh() # important otherwise it results in too many redirects
95
+
96
+ wait = WebDriverWait(driver, 60)
97
+
98
+ logging.info("Entering postcode")
99
+ input_element_postcode = wait.until(
100
+ EC.element_to_be_clickable(
101
+ (By.XPATH, '//input[@id="CTID-JmLqCKl2-_-A"]')
102
+ )
103
+ )
104
+
105
+ driver.execute_script(
106
+ "arguments[0].scrollIntoView();", input_element_postcode
107
+ )
108
+
109
+ logging.info(f"Entering postcode '{str(user_postcode)}'")
110
+ # Force the value through the DOM cos send_keys just don't work for some reason :(
111
+ driver.execute_script(
112
+ f"arguments[0].value='{str(user_postcode)}'", input_element_postcode
113
+ )
114
+
115
+ logging.info("Searching for postcode")
116
+ input_element_postcode_btn = wait.until(
117
+ EC.element_to_be_clickable((By.XPATH, '//input[@type="submit"]'))
118
+ )
119
+
120
+ input_element_postcode_btn.click()
121
+
122
+ logging.info("Waiting for address dropdown")
123
+ input_element_postcode_dropdown = wait.until(
124
+ EC.element_to_be_clickable(
125
+ (By.XPATH, '//select[@id="CTID-KOeKcmrC-_-A"]')
126
+ )
127
+ )
128
+
129
+ logging.info("Selecting address")
130
+ drop_down_values = Select(input_element_postcode_dropdown)
131
+ option_element = wait.until(
132
+ EC.presence_of_element_located(
133
+ (By.CSS_SELECTOR, f'option[value="{str(user_uprn)}"]')
134
+ )
135
+ )
136
+
137
+ driver.execute_script("arguments[0].scrollIntoView();", option_element)
138
+ drop_down_values.select_by_value(str(user_uprn))
139
+
140
+ input_element_address_btn = wait.until(
141
+ EC.element_to_be_clickable((By.XPATH, '//input[@value="Submit"]'))
142
+ )
143
+
144
+ input_element_address_btn.click()
145
+
146
+ # Be patient, clicks take time!
147
+ time.sleep(2)
148
+ # logging.info(driver.page_source)
149
+
150
+ try:
151
+ link_element = driver.find_element(
152
+ By.XPATH,
153
+ '//a[contains(text(),"Find your current bin collection day")]',
154
+ )
155
+ logging.info(
156
+ "Found override panel span, search for link and use old logic"
157
+ )
158
+
159
+ link_element.click()
160
+
161
+ # Be patient, clicks take time!
162
+ time.sleep(2)
163
+
164
+ bins = self.get_legacy_bins(driver.page_source)
165
+
166
+ except NoSuchElementException:
167
+ logging.info("Waiting for bin collection table")
168
+ collections_table = wait.until(
169
+ EC.presence_of_element_located(
170
+ (
171
+ By.XPATH,
172
+ '//table[contains(@class,"eb-1j4UaesZ-tableContent")]',
173
+ )
174
+ )
175
+ )
176
+
177
+ soup = BeautifulSoup(driver.page_source, features="html.parser")
178
+ rows = soup.find_all(class_="eb-1j4UaesZ-tableRow")
179
+
180
+ for row in rows:
181
+ cols = row.find_all("td")
182
+ date_string = cols[0].findChild("div").findChild("div").get_text()
183
+ bin_type = cols[1].findChild("div").findChild("div").get_text()
184
+
185
+ col_date = datetime.strptime(date_string, "%A %B %d, %Y")
186
+ bins.append(
187
+ {
188
+ "type": bin_type,
189
+ "collectionDate": datetime.strftime(col_date, date_format),
190
+ }
191
+ )
192
+
193
+ return {"bins": bins}
194
+
195
+ except Exception as e:
196
+ logging.error(f"An error occurred: {e}")
197
+ raise
198
+
199
+ finally:
200
+ if driver:
201
+ driver.quit()