amarillo/amarillo-core
5
0
Fork 0
Code Issues 17 Pull requests Packages Projects Releases Wiki Activity

Implement Holger's changes in mfdz/amarillo to plugins branch version #30

New issue
Open
opened 2025-01-28 12:20:02 +01:00 by Csaba · 3 comments
Csaba commented 2025-01-28 12:20:02 +01:00
Owner
Copy link

Holger has made some changes to mfdz/amarillo main branch that we need to propagate to the enhancer and generator if code that we've moved to a different repo was affected.

Relevant commits:

  • - c0442bf fix: only store enhanced trips if they have two or more stops
  • - f0ac7cf fix: remove unused code
  • - 8ca0856 fix pydantic deprecation
  • - c97aad8 fix docs
  • - d0caf9e fix: switch to regex instead of string
  • - 4a5399f Support configuring stop snapping/enhancement per agency
  • - dec25b8 Remove servers list so current service is used by default
  • - 1630e35 pin numpy dep to <2
  • - 2666fbb fix: only skip stop, if former was not already skipped
  • - a8447e8 (tag: v1.0.0) remove config for ummadum
  • - 11dbc17 fix: instantiate CarpoolService with config.max_age_carpool_offers_in_days
  • - 249856c add some more logging for stops loading
  • - f7fcdcb fix: call _extract_stop on class
  • - 55bb00f fix: switch from on_closed to on_modified
Holger has made some changes to mfdz/amarillo main branch that we need to propagate to the enhancer and generator if code that we've moved to a different repo was affected. Relevant commits: - [ ] - c0442bf fix: only store enhanced trips if they have two or more stops - [ ] - f0ac7cf fix: remove unused code - [ ] - 8ca0856 fix pydantic deprecation - [ ] - c97aad8 fix docs - [ ] - d0caf9e fix: switch to regex instead of string - [ ] - 4a5399f Support configuring stop snapping/enhancement per agency - [ ] - dec25b8 Remove servers list so current service is used by default - [ ] - 1630e35 pin numpy dep to <2 - [x] - 2666fbb fix: only skip stop, if former was not already skipped - [x] - a8447e8 (tag: v1.0.0) remove config for ummadum - [x] - 11dbc17 fix: instantiate CarpoolService with config.max_age_carpool_offers_in_days - [x] - 249856c add some more logging for stops loading - [x] - f7fcdcb fix: call _extract_stop on class - [x] - 55bb00f fix: switch from on_closed to on_modified
Csaba self-assigned this 2025-01-28 12:20:02 +01:00
Csaba added this to the Amarillo project 2025-01-28 12:20:02 +01:00
Csaba commented 2025-01-29 13:25:22 +01:00
Author
Owner
Copy link

Ported 55bb00f776 (diff-05267724e8c41d6afab55339f394da1104d353c2d0bfdc4c055830cba037a988) to fbb0d64601 (fix: switch from on_closed to on_modified)

f7fcdcb864 (fix: call _extract_stop on class) was already merged
249856cb38 (add some more logging for stops loading) ported to 7f695e8672 and 3cc971ab62

Ported https://github.com/mfdz/amarillo/commit/55bb00f776636cb1313f2a2ef74a7d2461828e85#diff-05267724e8c41d6afab55339f394da1104d353c2d0bfdc4c055830cba037a988 to https://github.com/mfdz/amarillo-gtfs-generator/commit/fbb0d64601bbf21428d75ab373cedd91c0cbf718 (fix: switch from on_closed to on_modified) https://github.com/mfdz/amarillo/commit/f7fcdcb864b1e8bc53ab3782f20d315091a41b85 (fix: call _extract_stop on class) was already merged https://github.com/mfdz/amarillo/commit/249856cb3802631f1bd9d95c14e34c6b69bcd3f6 (add some more logging for stops loading) ported to https://github.com/mfdz/amarillo-enhancer/commit/7f695e8672ee5333b7618ad9dd09043664ba9213 and https://github.com/mfdz/amarillo-gtfs-generator/commit/3cc971ab6209e2005e69d502dcbc58f7e9dadc2c
Csaba commented 2025-01-29 13:59:58 +01:00
Author
Owner
Copy link

0c33f5a54a and 11dbc17dde fix: instantiate CarpoolService with config.max_age_carpool_offers_in_days ported to a27c66e9d7

a8447e8b2e (remove config for ummadum) should merge fine, no change required

2666fbbf67 (fix: only skip stop, if former was not already skipped) ported in ad5b593bfb
in the process I've discovered some duplicated/unused code in generator, as it also contains tripstore with some enhancement code. I could not immediately figure out how the CarpoolService and the TripStore depend on each other and how they can be untangled, but we should clean this up later

https://github.com/mfdz/amarillo/commit/0c33f5a54a40270b70829049e1cd55a92c792066 and https://github.com/mfdz/amarillo/commit/11dbc17dde221a88ac903db34370c7665bfedfd6 fix: instantiate CarpoolService with config.max_age_carpool_offers_in_days ported to https://github.com/mfdz/amarillo-gtfs-generator/commit/a27c66e9d7ae8384e6c98601ae2560350d87c219 https://github.com/mfdz/amarillo/commit/a8447e8b2eb0b0b7086cfccd57bcf35bee4f61e4 (remove config for ummadum) should merge fine, no change required https://github.com/mfdz/amarillo/commit/2666fbbf670f639306e8e78f574088acc48ba02c (fix: only skip stop, if former was not already skipped) ported in https://github.com/mfdz/amarillo-enhancer/commit/ad5b593bfb4c3cd67dfd554850d148ca47b9b5a9 in the process I've discovered some duplicated/unused code in generator, as it also contains tripstore with some enhancement code. I could not immediately figure out how the CarpoolService and the TripStore depend on each other and how they can be untangled, but we should clean this up later
Csaba commented 2025-01-29 14:57:27 +01:00
Author
Owner
Copy link

Most of the rest should go through a merge or rebasing the plugins branch onto main. I made a test here of how a rebase might look with my own fork. The commit tree is not the cleanest, but the file changes are very few.

Most of the rest should go through a merge or rebasing the plugins branch onto main. I made a test [here](https://github.com/mfdz/amarillo/compare/plugins...frsaba:amarillo:origin/plugins) of how a rebase might look with my own fork. The commit tree is not the cleanest, but the file changes are very few.
Sign in to join this conversation.
No Branch/Tag specified
Branches Tags
main
dev
fastapi-enhancer
permissions
carpool-events
bearer-token
log-errors
grfs-export
docker-build-test
static-files
jenkins-test
No results found.
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Amarillo
Assignees
Clear assignees
No assignees
Csaba
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: amarillo/amarillo-core#30
No description provided.
Delete branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?