Skip to content

BUG: Duplicate _controllers in Flight.TimeNodes.merge()#931

Merged
Gui-FernandesBR merged 2 commits intoRocketPy-Team:developfrom
zuorenchen:bug/duplicate-time-node-merge
Feb 28, 2026
Merged

BUG: Duplicate _controllers in Flight.TimeNodes.merge()#931
Gui-FernandesBR merged 2 commits intoRocketPy-Team:developfrom
zuorenchen:bug/duplicate-time-node-merge

Conversation

@zuorenchen
Copy link

Pull request type

  • Code changes (bugfix, features)
  • Code maintenance (refactoring, formatting, tests)
  • ReadMe, Docs and GitHub updates
  • Other (please describe):

Checklist

  • Tests for the changes have been added (if needed)
  • Docs have been reviewed and added / updated
  • Lint (black rocketpy/ tests/) has passed locally
  • All tests (pytest tests -m slow --runslow) have passed locally
  • CHANGELOG.md has been updated (if relevant)

Current behavior

Enter text here...

New behavior

Enter text here...

Breaking change

  • Yes
  • No

Additional information

Enter text here...

@Gui-FernandesBR Gui-FernandesBR marked this pull request as ready for review February 28, 2026 00:11
@Gui-FernandesBR Gui-FernandesBR requested a review from a team as a code owner February 28, 2026 00:11
@codecov
Copy link

codecov bot commented Feb 28, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 81.10%. Comparing base (9cf3dd4) to head (38a808a).
⚠️ Report is 30 commits behind head on develop.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop     #931      +/-   ##
===========================================
+ Coverage    80.27%   81.10%   +0.82%     
===========================================
  Files          104      107       +3     
  Lines        12769    13832    +1063     
===========================================
+ Hits         10250    11218     +968     
- Misses        2519     2614      +95     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@Gui-FernandesBR
Copy link
Member

changelof needs an update before merge

@zuorenchen zuorenchen changed the title BUG: Duplicate merge of _controllers in Flight.TimeNodes.merge() BUG: Duplicate _controllers in Flight.TimeNodes.merge() Feb 28, 2026
@Gui-FernandesBR Gui-FernandesBR merged commit 8cdb69f into RocketPy-Team:develop Feb 28, 2026
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

BUG: Duplicate merge of _controllers in Flight.TimeNodes.merge()

2 participants