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

Version 12.1 backport #9636

Merged
merged 5 commits into from
Jan 3, 2025
Merged

Conversation

berland
Copy link
Contributor

@berland berland commented Jan 3, 2025

Backports:

  • Compatibility with everest-models 1.3.1 (bugfix compared to 1.3.0)
  • Workaround Python bug for shutil.copytree() exceptions
  • Avoid repeated logging for each cluster in misfit analysis
  • Avoid deprecated utcnow()
  • PR title captures the intent of the changes, and is fitting for release notes.
  • Added appropriate release note label
  • Commit history is consistent and clean, in line with the contribution guidelines.
  • Make sure unit tests pass locally after every commit (git rebase -i main --exec 'pytest tests/ert/unit_tests -n logical -m "not integration_test"')

When applicable

  • When there are user facing changes: Updated documentation
  • New behavior or changes to existing untested code: Ensured that unit tests are added (See Ground Rules).
  • Large PR: Prepare changes in small commits for more convenient review
  • Bug fix: Add regression test for the bug
  • Bug fix: Create Backport PR to latest release

@berland berland added the release-notes:bug-fix Automatically categorise as bug fix in release notes label Jan 3, 2025
DanSava and others added 5 commits January 3, 2025 09:29
See python/cpython#102931

This PR will detect if the bug is triggered, and massage the data
accordingly. Patch is prepared upstream destined for Python 3.14.

Existing tests are split for readability and preciseness, and extended
to test that the workaround is performing as it should.
@berland berland force-pushed the version-12.1-backport branch from c4a50d5 to dbd7d2a Compare January 3, 2025 08:30
@berland berland enabled auto-merge (rebase) January 3, 2025 08:32
Copy link

codspeed-hq bot commented Jan 3, 2025

CodSpeed Performance Report

Merging #9636 will not alter performance

Comparing berland:version-12.1-backport (dbd7d2a) with main (7e8d20c)

Summary

✅ 24 untouched benchmarks

@berland berland merged commit 80bd3f7 into equinor:version-12.1 Jan 3, 2025
41 checks passed
@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 91.86%. Comparing base (ead6423) to head (dbd7d2a).
Report is 5 commits behind head on version-12.1.

Additional details and impacted files
@@               Coverage Diff                @@
##           version-12.1    #9636      +/-   ##
================================================
- Coverage         91.88%   91.86%   -0.03%     
================================================
  Files               433      433              
  Lines             26811    26811              
================================================
- Hits              24636    24630       -6     
- Misses             2175     2181       +6     
Flag Coverage Δ
cli-tests 39.74% <33.33%> (ø)
everest-models-test 34.59% <20.00%> (-0.03%) ⬇️
gui-tests 72.13% <100.00%> (ø)
integration-test 38.73% <40.00%> (-0.02%) ⬇️
performance-tests 52.04% <0.00%> (+0.08%) ⬆️
test 40.09% <40.00%> (ø)
unit-tests 74.14% <80.00%> (-0.01%) ⬇️

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-notes:bug-fix Automatically categorise as bug fix in release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants