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

MAINT: Update develop branch from v1.0.0 master #417

Merged
merged 1,166 commits into from
Sep 23, 2023

Conversation

phmbressan
Copy link
Collaborator

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

Develop branch was frozen prior to the release of v1.0.0.

New behavior

This PR updates the develop branch with the current master v1.0.0 branch status in order to reinstate its usage.

Breaking change

  • Yes (comparing to the previous develop)
  • No

MateusStano and others added 30 commits June 28, 2023 22:29
MAINT: Move the rail length definition to the Flight Class
'RocketPy-Team/beta/v1.0.0' into enh/liquid-motors
- update SolidMotor definition
- wrong assert in in test_rail_length
- tanks have no gasInertiaTensor attribute
- improve underfilled/overfilled errors
- set discrete when extremely necessary
- SEBLM: changing the railLength to Flight class
- Tank class usage: fix TODOs
Update rocketpy/Function.py

Co-authored-by: MateusStano <[email protected]>
Update rocketpy/Function.py

Co-authored-by: phmbressan <[email protected]>
 enh/move-liquid-plots-and-prints
- Sort imports
- avoid printing blank lines
- more prints and plots for tank geometry
@phmbressan phmbressan added the Git housekeeping Clean and organize our github label Sep 23, 2023
@phmbressan phmbressan self-assigned this Sep 23, 2023
@review-notebook-app
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

@Gui-FernandesBR Gui-FernandesBR changed the title Update develop branch from v1.0.0 master MAINT: Update develop branch from v1.0.0 master Sep 23, 2023
Copy link
Member

@Gui-FernandesBR Gui-FernandesBR left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved.

You can merge it as long as the testing get passed.

@phmbressan phmbressan merged commit 1606bbd into develop Sep 23, 2023
11 checks passed
@phmbressan phmbressan deleted the maint/reinstate-develop branch September 23, 2023 22:26
@Gui-FernandesBR Gui-FernandesBR added this to the Release v1.X.0 milestone Oct 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Git housekeeping Clean and organize our github
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants