Skip to content

Conversation

@dyu056
Copy link
Contributor

@dyu056 dyu056 commented Jan 25, 2024

Pull request type

  • [ v] Code changes (bugfix, features)

Checklist

  • [ v] Tests for the changes have been added (if needed)
  • [ v] Docs have been reviewed and added / updated
  • [ v] Lint (black rocketpy/ tests/) has passed locally
  • [ v] All tests (pytest --runslow) have passed locally

Current behavior

Issue 531, current behavior doesn't change too much

New behavior

Issue 531, current behavior doesn't change too much

Breaking change

  • Yes
  • [ v] No

Additional information

Enter text here...

@dyu056 dyu056 requested a review from giovaniceotto as a code owner January 25, 2024 22:53
@dyu056 dyu056 linked an issue Jan 25, 2024 that may be closed by this pull request
2 tasks
@codecov
Copy link

codecov bot commented Jan 25, 2024

Codecov Report

Attention: 2 lines in your changes are missing coverage. Please review.

Comparison is base (d86c760) 71.23% compared to head (397ec38) 71.21%.
Report is 1 commits behind head on master.

Files Patch % Lines
rocketpy/environment/environment_analysis.py 50.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master     #541      +/-   ##
==========================================
- Coverage   71.23%   71.21%   -0.03%     
==========================================
  Files          55       55              
  Lines        9259     9242      -17     
==========================================
- Hits         6596     6582      -14     
+ Misses       2663     2660       -3     
Flag Coverage Δ
unittests 71.21% <60.00%> (-0.03%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

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

Comment on lines +11 to +14
try:
from functools import cached_property
except ImportError:
from ..tools import cached_property
Copy link
Member

Choose a reason for hiding this comment

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

You can actually deleted the try-except statement and simply import using from functools import cached_property. This will work fine in any environment with python>3.8, so we are covered.

Also, there are a few more files where we do this kind of try-except.

image

@Gui-FernandesBR
Copy link
Member

This PR is trying to merge directly into the master branch. This needs to be changed to merge into develop instead.

I think the easiest solution is the cherry picking now: https://stackoverflow.com/questions/36055622/how-to-change-base-branch-in-git

It's important to follow the git flow correctly so we an easily navigate through our git tree in the future. Therefore, only hotfixes and releases should be merged directly to the master branch. New features needs to pass through the develop one.

1 similar comment
@Gui-FernandesBR
Copy link
Member

This PR is trying to merge directly into the master branch. This needs to be changed to merge into develop instead.

I think the easiest solution is the cherry picking now: https://stackoverflow.com/questions/36055622/how-to-change-base-branch-in-git

It's important to follow the git flow correctly so we an easily navigate through our git tree in the future. Therefore, only hotfixes and releases should be merged directly to the master branch. New features needs to pass through the develop one.

@Gui-FernandesBR Gui-FernandesBR changed the title Completed changes MNT: delete tools.cached_property (fix #531) Feb 12, 2024
@Gui-FernandesBR
Copy link
Member

Renamed the PR to make it easier for us.

@Gui-FernandesBR Gui-FernandesBR added this to the Release v1.X.0 milestone Feb 12, 2024
@Gui-FernandesBR Gui-FernandesBR marked this pull request as draft February 14, 2024 15:59
@Gui-FernandesBR Gui-FernandesBR deleted the 536-mnt-delete-cached-property branch April 25, 2024 10:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

No open projects
Status: Closed

Development

Successfully merging this pull request may close these issues.

MNT: delete tools.cached_property

3 participants