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

New version of the P Model architecture #442

Merged
merged 145 commits into from
Mar 4, 2025
Merged

Conversation

davidorme
Copy link
Collaborator

@davidorme davidorme commented Feb 28, 2025

Description

This PR is to bring all of the collected functionality in branch associated with the 2.0.0 meta issue (#383) down into develop. This:

  • allows us to make a new release 2.0.0-rc2
  • brings all of that new architecture into the main line to stop feature branches creeping apart.

Important

This is a huge PR, but the commits have all been reviewed by sub-PRs onto this branch, so it is pre-reviewed.

I'll need to make some pushes into:

in order to update them to this.

This doesn't completely close down all of the child issues in #383 but we want to bank these changes now.

Type of change

  • New feature (non-breaking change which adds functionality)
  • Optimization (back-end change that speeds up the code)
  • Bug fix (non-breaking change which fixes an issue)

Key checklist

  • Make sure you've run the pre-commit checks: $ pre-commit run -a
  • All tests pass: $ poetry run pytest

Further checks

  • Code is commented, particularly in hard-to-understand areas
  • Tests added that prove fix is effective or that feature works

@davidorme davidorme linked an issue Feb 28, 2025 that may be closed by this pull request
@codecov-commenter
Copy link

codecov-commenter commented Feb 28, 2025

Codecov Report

Attention: Patch coverage is 97.26316% with 13 lines in your changes missing coverage. Please review.

Project coverage is 96.73%. Comparing base (56ccf57) to head (9bad2be).
Report is 71 commits behind head on develop.

Files with missing lines Patch % Lines
pyrealm/pmodel/pmodel_environment.py 77.41% 7 Missing ⚠️
pyrealm/pmodel/pmodel.py 97.36% 5 Missing ⚠️
pyrealm/pmodel/acclimation.py 99.41% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop     #442      +/-   ##
===========================================
+ Coverage    96.27%   96.73%   +0.45%     
===========================================
  Files           34       35       +1     
  Lines         2659     2661       +2     
===========================================
+ Hits          2560     2574      +14     
+ Misses          99       87      -12     

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


from pyrealm.pmodel.scaler import SubdailyScaler
from pyrealm.pmodel.subdaily import memory_effect
from pyrealm.pmodel.acclimation import AcclimationModel

# A five day time series running from noon until noon
Copy link
Collaborator

@MarionBWeinzierl MarionBWeinzierl Mar 3, 2025

Choose a reason for hiding this comment

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

With the change in the time the comments needs adapting - it's now noon until midnight

Suggested change
# A five day time series running from noon until noon
# A five day time series running from noon until midnight

Copy link
Collaborator

@j-emberton j-emberton left a comment

Choose a reason for hiding this comment

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

Great work David

@davidorme davidorme merged commit e776849 into develop Mar 4, 2025
16 checks passed
@davidorme davidorme deleted the 383-meta-release-200 branch March 4, 2025 14:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

[META] Release 2.0.0
4 participants