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

MNT: update develop branch with changes from master #461

Merged
merged 37 commits into from
Nov 15, 2023
Merged

Conversation

Gui-FernandesBR
Copy link
Member

@Gui-FernandesBR Gui-FernandesBR commented Nov 13, 2023

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 --runslow) have passed locally

Current behavior

I'm opening this PR as a reminder that we need to rebase the develop branch before preparing the release v1.1.0 this week.

New behavior

There are 3 PR waiting on the line to be merged on master. We need to wait for them before merging this PR.

Conflicts may be solved after the 3 PR please.

Breaking change

  • No

Additional information

This can only be merged after approved.

Gui-FernandesBR and others added 30 commits October 13, 2023 17:14
- This happens when we use EmptyMotors
- ValueError: attempt to get argmax of an empty sequence
BUG: flight.prints.max_values() fails when launching an EmptyMotor
DOC: Add documentation on how to build the docs
This is important because the github actions were not being activated after
modifying the .yaml files
- Refined input parameters for apogee and liftoff speed calculations
- Inertia definition in the Rocket class
- Change the Motor.dry_mass definition
- Avoid repetition of dry_mass definitions
- Add a few for docstrings
@Gui-FernandesBR Gui-FernandesBR added the Help wanted Extra attention is needed label Nov 13, 2023
@Gui-FernandesBR Gui-FernandesBR self-assigned this Nov 13, 2023
@Gui-FernandesBR Gui-FernandesBR added this to the Release v1.X.0 milestone Nov 13, 2023
@giovaniceotto
Copy link
Member

I believe #451 could be merged into develop and be released with v1.1.0.

I wouldn't call it a major bug that requires a hot fix, since the current behavior is documented.

@Gui-FernandesBR
Copy link
Member Author

I believe #451 could be merged into develop and be released with v1.1.0.

I wouldn't call it a major bug that requires a hot fix, since the current behavior is documented.

That will be released with v1.1.0 anyways, regardless of the head branch, we decided to not have a v1.0.2 version

@giovaniceotto
Copy link
Member

@Gui-FernandesBR, I strongly believe we should follow the appropriate protocols here. Since there is no hotfix necessary, all code additions (i.e. not just doc changes) should go directly to develop before master.

@Gui-FernandesBR Gui-FernandesBR merged commit 53176f6 into develop Nov 15, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Help wanted Extra attention is needed
Projects
Status: Closed
Development

Successfully merging this pull request may close these issues.

4 participants