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

Merges develop into release (1.14.0 tag prep) #1665

Merged
merged 859 commits into from
Sep 18, 2023
Merged

Merges develop into release (1.14.0 tag prep) #1665

merged 859 commits into from
Sep 18, 2023

Conversation

kbwestfall
Copy link
Collaborator

As titled.

Please do not merge until I've posted the results of the dev-suite tests.

@kbwestfall
Copy link
Collaborator Author

First pass at tests were (finally) successful:

Test Summary
--------------------------------------------------------
--- PYTEST PYPEIT UNIT TESTS PASSED  234 passed, 73 warnings in 399.53s (0:06:39) ---
--- PYTEST UNIT TESTS PASSED  123 passed, 193 warnings in 959.71s (0:15:59) ---
--- PYTEST VET TESTS PASSED  53 passed, 54 warnings in 967.68s (0:16:07) ---
--- PYPEIT DEVELOPMENT SUITE PASSED 217/217 TESTS  ---
Testing Started at 2023-09-11T16:53:22.635773
Testing Completed at 2023-09-12T03:10:42.700263
Total Time: 10:17:20.064490

Still to do:

setup.cfg Outdated Show resolved Hide resolved
@codecov-commenter
Copy link

codecov-commenter commented Sep 12, 2023

Codecov Report

Merging #1665 (4ec1bed) into release (6b2b85c) will increase coverage by 1.42%.
Report is 2 commits behind head on release.
The diff coverage is 33.28%.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

@@             Coverage Diff             @@
##           release    #1665      +/-   ##
===========================================
+ Coverage    39.89%   41.31%   +1.42%     
===========================================
  Files          190      189       -1     
  Lines        42875    43311     +436     
===========================================
+ Hits         17105    17894     +789     
+ Misses       25770    25417     -353     
Files Changed Coverage Δ
pypeit/archive.py 95.08% <ø> (ø)
pypeit/bitmask.py 71.42% <ø> (ø)
pypeit/bspline/bspline.py 80.00% <ø> (+9.03%) ⬆️
pypeit/core/coadd.py 5.61% <ø> (+0.01%) ⬆️
pypeit/core/extract.py 77.16% <ø> (+4.15%) ⬆️
pypeit/core/flexure.py 45.82% <ø> (ø)
pypeit/core/gui/identify.py 8.62% <0.00%> (+0.03%) ⬆️
pypeit/core/gui/object_find.py 11.06% <ø> (ø)
pypeit/core/gui/skysub_regions.py 10.30% <ø> (ø)
pypeit/core/meta.py 86.95% <ø> (ø)
... and 124 more

... and 3 files with indirect coverage changes

@kbwestfall
Copy link
Collaborator Author

Tests pass!

Test Summary
--------------------------------------------------------
--- PYTEST PYPEIT UNIT TESTS PASSED  239 passed, 73 warnings in 397.26s (0:06:37) ---
--- PYTEST UNIT TESTS PASSED  123 passed, 193 warnings in 973.80s (0:16:13) ---
--- PYTEST VET TESTS PASSED  53 passed, 68 warnings in 945.05s (0:15:45) ---
--- PYPEIT DEVELOPMENT SUITE PASSED 217/217 TESTS  ---
Testing Started at 2023-09-12T21:45:12.552434
Testing Completed at 2023-09-13T07:44:47.045941
Total Time: 9:59:34.493507

@profxj , You'll need to override the blocked merge. The tests that are hung are because of the changes to CI that Tim put in a while ago.

Copy link
Collaborator

@tbowers7 tbowers7 left a comment

Choose a reason for hiding this comment

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

Looks good!

@kbwestfall
Copy link
Collaborator Author

There are some test failures to work through:

Test Summary
--------------------------------------------------------
--- PYTEST PYPEIT UNIT TESTS PASSED  239 passed, 73 warnings in 641.35s (0:10:41) ---
--- PYTEST UNIT TESTS PASSED  133 passed, 172 warnings in 1195.56s (0:19:55) ---
--- PYTEST VET TESTS FAILED  3 failed, 55 passed, 34 warnings in 1124.76s (0:18:44) ---
--- PYPEIT DEVELOPMENT SUITE FAILED 4/231 TESTS  ---
Failed tests:
    keck_lris_red/multi_1200_9000_d680_1x2 pypeit
    keck_lris_red/multi_1200_9000_d680 pypeit
    vlt_xshooter/VIS_1x1_LTT3218 pypeit_sensfunc
    vlt_xshooter/VIS_1x1_Feige110 pypeit_sensfunc
Skipped tests:
Testing Started at 2023-09-14T01:32:38.650865
Testing Completed at 2023-09-14T22:33:29.081505
Total Time: 21:00:50.430640

I think the vet test failures are a consequence of the other failures.

@kbwestfall
Copy link
Collaborator Author

Errors for Keck/LRISr were because of a filename change, and the VLT/XShooter errors were because of a download timeout. I've pushed the relevant code fixes and restarted the dev-suite.

@kbwestfall
Copy link
Collaborator Author

Tests pass!

Test Summary
--------------------------------------------------------
--- PYTEST PYPEIT UNIT TESTS PASSED  239 passed, 70 warnings in 716.40s (0:11:56) ---
--- PYTEST UNIT TESTS PASSED  133 passed, 171 warnings in 1373.39s (0:22:53) ---
--- PYTEST VET TESTS PASSED  58 passed, 69 warnings in 1333.03s (0:22:13) ---
--- PYPEIT DEVELOPMENT SUITE PASSED 231/231 TESTS  ---
Testing Started at 2023-09-15T18:49:04.245812
Testing Completed at 2023-09-17T04:46:04.732872
Total Time: 1 day, 9:57:00.487060

@profxj profxj merged commit ff02b9d into release Sep 18, 2023
23 checks passed
@kbwestfall kbwestfall deleted the staged branch October 3, 2023 16:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.