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.

Sign up for GitHub

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

Jump to bottom

Draft: Single test refactor #28

Closed
wants to merge 18 commits into from
Closed

Draft: Single test refactor #28

wants to merge 18 commits into from

Conversation

Alrobbertz
Copy link
Member

No description provided.

@Alrobbertz
Squashed commit of the following:
cdbb83c 
commit 4eb642d
Merge: 83a23c5 f2a6f35
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Dec 20 10:23:08 2023 -0500

    Merge branch 'main' into single_test

commit 83a23c5
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Fri Dec 8 16:42:45 2023 -0500

    trying to add my l0 binary

commit a173f53
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Dec 6 11:36:32 2023 -0500

    responded to all of ehsteve comments I hope

commit 588d244
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Dec 6 10:45:15 2023 -0500

    removing µEpoch

commit 414694b
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Dec 6 10:41:08 2023 -0500

    moving flight_stepper table

commit 1c143cf
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Dec 6 10:37:30 2023 -0500

    removing filenames from test_calibration

commit 5a9ab4c
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Dec 6 10:34:32 2023 -0500

    removing skeletons

commit 044daa3
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Dec 6 10:29:12 2023 -0500

    Single Test for one file test_calibration.py
    changed name of stats var
    removing unsusable bin file

commit a61435f
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Dec 6 10:04:37 2023 -0500

    removed extraneous tests

commit 5880661
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Dec 6 09:59:27 2023 -0500

    Don't need to do create my own cdf  with HermesData()

commit 011ab4b
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Dec 6 09:47:08 2023 -0500

    doctest_plus = "enabled"
    text_file_format = "rst"
    addopts = "--doctest-rst"
    is preventing me from running pytest

commit 0a8aee2
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Fri Dec 1 11:11:41 2023 -0500

    finally realized calibrate_file is a single file
    process_file is a list of files

commit 4fb394d
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Fri Dec 1 14:16:09 2023 +0000

    sys.path, pyproject astropy dependency problem

commit 6f1e2db
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Fri Dec 1 08:42:46 2023 -0500

    zipping large bin

commit 13c70cb
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Fri Dec 1 08:40:11 2023 -0500

    settling on one large file and one small file test

commit efdb56e
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Thu Nov 30 14:02:20 2023 -0500

     fighting with cicd

commit fe66279
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Thu Nov 30 13:58:46 2023 -0500

    loosening for astropy wasn't good enough,
    removing numpy also

commit 86cbe8a
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Thu Nov 30 13:55:32 2023 -0500

    loosening dependencies in pyproject.toml
    adding cdflib

commit 10e6ae6
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Thu Nov 30 13:52:19 2023 -0500

    moved pyproject.toml

commit fdcc6d4
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Thu Nov 30 13:44:40 2023 -0500

    ci/cd, testing.yml needs me to have a pyproject.toml
    It seems like one was created when I ran the devcontainer on hermes_eea

commit fb6d803
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Thu Nov 30 13:06:30 2023 -0500

    updating .github/testing.yml for exploratory reasons
    correcting Liams time function
    a couple of comments

commit f318497
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Nov 29 15:37:59 2023 -0500

    test_calibration.py passes w/o failure

commit 784d0b1
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Nov 29 11:19:54 2023 -0500

    This successfully wrote 1 ts and 3 spectra 1d (to separate recs)
    2d (EnergyLabels) 3d (ACCUM)

commit 1b30582
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Nov 29 10:48:20 2023 -0500

    This is first branch using  hermes_eea_data = HermesData(timeseries=ts_1d_uQ, spectra=spectra_EnergyLabels, meta=bare_attrs)
    It worked for energy labels

commit 7d2f470
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Nov 29 09:17:45 2023 -0500

    changed units u. to astropy_units

commit 87887f3
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Tue Nov 28 15:55:54 2023 -0500

    This has new Epoch_TAI time. new bin l0 file from Liam
    outputs 1d sep-rec with u.Quantity
    outputs my data all-in-one-rec

commit 53ee35e
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Tue Nov 28 13:45:30 2023 -0500

    this produces separate record data for 1D data

commit 4087636
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Tue Nov 28 13:28:24 2023 -0500

    with barebones attrs this indeed does :
    this write separate records with their code and single records with mine

commit cb2a7f3
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Tue Nov 28 13:20:48 2023 -0500

    this write separate records with their code and single records with mine

commit f0f1aff
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Tue Nov 28 10:57:12 2023 -0500

    This creates a cdf file using HermesData

commit 638e6fd
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Tue Nov 28 09:37:39 2023 -0500

    updated SkymapFactory with np.uint16
    starting to work with HermesData in
    conda env add_eea

commit b67744e
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Mon Nov 27 15:56:24 2023 -0500

    This does everything but write to cdf. I think I am supposed to use HermesData container

commit e7b0ba1
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Mon Nov 27 13:45:44 2023 -0500

    These are the changes I made to create a l0 file...
    a cdf file with the raw data

commit 6ad4e19
Author: Liam Greenlee <liam.a.greenlee@nasa.gov>
Date:   Wed Feb 15 15:36:45 2023 -0500

    Add L0 to L1A code

commit b8230d4
Merge: 7bd3a1a d1b3f9a
Author: Liam Greenlee <liam.a.greenlee@nasa.gov>
Date:   Tue Feb 14 16:11:35 2023 -0500

    Merge pull request HERMES-SOC#1 from liamgreenlee/skeleton1

    Skeleton1

commit d1b3f9a
Author: S Kreisler <Stephen.Kreisler@nasa.gov>
Date:   Tue Feb 14 15:35:43 2023 -0500

    Fixed data type inconsistencies.

commit b9b61a8
Author: S Kreisler <Stephen.Kreisler@nasa.gov>
Date:   Tue Feb 14 14:22:08 2023 -0500

    Initial EEA L1 master skeleton

commit 7bd3a1a
Author: Liam Greenlee <liam.a.greenlee@nasa.gov>
Date:   Wed Feb 8 10:48:32 2023 -0500

    Fix formatting

commit b45aa5d
Author: Liam Greenlee <liam.a.greenlee@nasa.gov>
Date:   Wed Feb 8 10:41:14 2023 -0500

    Fix pytests

commit 7960dfe
Author: Liam Greenlee <liam.a.greenlee@nasa.gov>
Date:   Tue Feb 7 14:54:01 2023 -0500

    black format fix

commit d40c478
Author: Liam Greenlee <liam.a.greenlee@nasa.gov>
Date:   Tue Feb 7 14:49:13 2023 -0500

    Add l0 parsing

commit 8a0f31c
Author: Liam Greenlee <liam.a.greenlee@nasa.gov>
Date:   Tue Feb 7 13:53:41 2023 -0500

    Add sci packet def

commit 63d70cb
Author: Liam Greenlee <liam.a.greenlee@nasa.gov>
Date:   Tue Feb 7 13:04:17 2023 -0500

    Add example l0 binary for testing

commit 338ece0
Author: Liam Greenlee <liam.a.greenlee@nasa.gov>
Date:   Wed Feb 1 11:31:35 2023 -0500

    Remove unbinning to use ccsdspy array type instead

commit 89de354
Author: Liam Greenlee <liam.a.greenlee@nasa.gov>
Date:   Wed Feb 1 11:17:10 2023 -0500

    Reformatting with black

commit 29f1d5a
Merge: 04cb3ff c121c02
Author: Liam Greenlee <liam.a.greenlee@nasa.gov>
Date:   Wed Feb 1 11:11:54 2023 -0500

    Merge branch 'main' of https://github.com/HERMES-SOC/hermes_eea

commit 04cb3ff
Author: Liam Greenlee <liam.a.greenlee@nasa.gov>
Date:   Thu Dec 15 10:57:18 2022 -0500

    Add accum packet unbinning functions
@Alrobbertz
Update test Workflows
b4f9dc0
@Alrobbertz
Black Reformatting
f2f52a3
@Alrobbertz
Codestyle
450481b
@Alrobbertz
Codestyle
5400bba
@Alrobbertz
Codestyle
bde018e
@Alrobbertz
Copy link
Member Author

Alrobbertz commented Dec 21, 2023 •
edited
Loading

Added Ignores for E203 in the setup.cfg based on this issue and the black guidance here

@dbarrous dbarrous marked this pull request as ready for review December 22, 2023 19:06
@dbarrous dbarrous changed the title Single test refactor Draft: Single test refactor Dec 22, 2023
@dbarrous
Copy link
Member

My bad I accidentally opened this from Draft

@dbarrous dbarrous marked this pull request as draft December 22, 2023 19:10
Alrobbertz
Alrobbertz commented Jan 2, 2024
View reviewed changes
pyproject.toml Outdated Show resolved Hide resolved
@Alrobbertz
Squashed commit of the following:
b10d271 
commit ad7a072
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Jan 10 14:52:50 2024 -0500

    added TAI time comment

commit f3c5cdb
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Mon Jan 8 18:12:51 2024 -0500

    reconciling test_file_tools.py

commit 4aa809f
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Mon Jan 8 17:29:05 2024 -0500

    addressing the issue of not being inside of hermes core

commit 29ce88e
Merge: f8718f3 d1cc226
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Mon Jan 8 16:57:57 2024 -0500

    Merge remote-tracking branch 'upstream/main' into single_test

commit f8718f3
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Mon Jan 8 16:36:53 2024 -0500

    reasonably interesting change

commit 05a6733
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Mon Jan 8 15:20:34 2024 -0500

    ignoring skeleton test

commit 4eb642d
Merge: 83a23c5 f2a6f35
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Dec 20 10:23:08 2023 -0500

    Merge branch 'main' into single_test

commit 83a23c5
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Fri Dec 8 16:42:45 2023 -0500

    trying to add my l0 binary

commit a173f53
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Dec 6 11:36:32 2023 -0500

    responded to all of ehsteve comments I hope

commit 588d244
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Dec 6 10:45:15 2023 -0500

    removing µEpoch

commit 414694b
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Dec 6 10:41:08 2023 -0500

    moving flight_stepper table

commit 1c143cf
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Dec 6 10:37:30 2023 -0500

    removing filenames from test_calibration

commit 5a9ab4c
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Dec 6 10:34:32 2023 -0500

    removing skeletons

commit 044daa3
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Dec 6 10:29:12 2023 -0500

    Single Test for one file test_calibration.py
    changed name of stats var
    removing unsusable bin file

commit a61435f
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Dec 6 10:04:37 2023 -0500

    removed extraneous tests

commit 5880661
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Dec 6 09:59:27 2023 -0500

    Don't need to do create my own cdf  with HermesData()

commit 011ab4b
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Dec 6 09:47:08 2023 -0500

    doctest_plus = "enabled"
    text_file_format = "rst"
    addopts = "--doctest-rst"
    is preventing me from running pytest

commit 0a8aee2
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Fri Dec 1 11:11:41 2023 -0500

    finally realized calibrate_file is a single file
    process_file is a list of files

commit 4fb394d
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Fri Dec 1 14:16:09 2023 +0000

    sys.path, pyproject astropy dependency problem

commit 6f1e2db
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Fri Dec 1 08:42:46 2023 -0500

    zipping large bin

commit 13c70cb
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Fri Dec 1 08:40:11 2023 -0500

    settling on one large file and one small file test

commit efdb56e
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Thu Nov 30 14:02:20 2023 -0500

     fighting with cicd

commit fe66279
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Thu Nov 30 13:58:46 2023 -0500

    loosening for astropy wasn't good enough,
    removing numpy also

commit 86cbe8a
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Thu Nov 30 13:55:32 2023 -0500

    loosening dependencies in pyproject.toml
    adding cdflib

commit 10e6ae6
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Thu Nov 30 13:52:19 2023 -0500

    moved pyproject.toml

commit fdcc6d4
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Thu Nov 30 13:44:40 2023 -0500

    ci/cd, testing.yml needs me to have a pyproject.toml
    It seems like one was created when I ran the devcontainer on hermes_eea

commit fb6d803
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Thu Nov 30 13:06:30 2023 -0500

    updating .github/testing.yml for exploratory reasons
    correcting Liams time function
    a couple of comments

commit f318497
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Nov 29 15:37:59 2023 -0500

    test_calibration.py passes w/o failure

commit 784d0b1
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Nov 29 11:19:54 2023 -0500

    This successfully wrote 1 ts and 3 spectra 1d (to separate recs)
    2d (EnergyLabels) 3d (ACCUM)

commit 1b30582
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Nov 29 10:48:20 2023 -0500

    This is first branch using  hermes_eea_data = HermesData(timeseries=ts_1d_uQ, spectra=spectra_EnergyLabels, meta=bare_attrs)
    It worked for energy labels

commit 7d2f470
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Wed Nov 29 09:17:45 2023 -0500

    changed units u. to astropy_units

commit 87887f3
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Tue Nov 28 15:55:54 2023 -0500

    This has new Epoch_TAI time. new bin l0 file from Liam
    outputs 1d sep-rec with u.Quantity
    outputs my data all-in-one-rec

commit 53ee35e
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Tue Nov 28 13:45:30 2023 -0500

    this produces separate record data for 1D data

commit 4087636
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Tue Nov 28 13:28:24 2023 -0500

    with barebones attrs this indeed does :
    this write separate records with their code and single records with mine

commit cb2a7f3
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Tue Nov 28 13:20:48 2023 -0500

    this write separate records with their code and single records with mine

commit f0f1aff
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Tue Nov 28 10:57:12 2023 -0500

    This creates a cdf file using HermesData

commit 638e6fd
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Tue Nov 28 09:37:39 2023 -0500

    updated SkymapFactory with np.uint16
    starting to work with HermesData in
    conda env add_eea

commit b67744e
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Mon Nov 27 15:56:24 2023 -0500

    This does everything but write to cdf. I think I am supposed to use HermesData container

commit e7b0ba1
Author: rstrub <richard.f.strub@nasa.gov>
Date:   Mon Nov 27 13:45:44 2023 -0500

    These are the changes I made to create a l0 file...
    a cdf file with the raw data

commit 6ad4e19
Author: Liam Greenlee <liam.a.greenlee@nasa.gov>
Date:   Wed Feb 15 15:36:45 2023 -0500

    Add L0 to L1A code

commit b8230d4
Merge: 7bd3a1a d1b3f9a
Author: Liam Greenlee <liam.a.greenlee@nasa.gov>
Date:   Tue Feb 14 16:11:35 2023 -0500

    Merge pull request HERMES-SOC#1 from liamgreenlee/skeleton1

    Skeleton1

commit d1b3f9a
Author: S Kreisler <Stephen.Kreisler@nasa.gov>
Date:   Tue Feb 14 15:35:43 2023 -0500

    Fixed data type inconsistencies.

commit b9b61a8
Author: S Kreisler <Stephen.Kreisler@nasa.gov>
Date:   Tue Feb 14 14:22:08 2023 -0500

    Initial EEA L1 master skeleton

commit 7bd3a1a
Author: Liam Greenlee <liam.a.greenlee@nasa.gov>
Date:   Wed Feb 8 10:48:32 2023 -0500

    Fix formatting

commit b45aa5d
Author: Liam Greenlee <liam.a.greenlee@nasa.gov>
Date:   Wed Feb 8 10:41:14 2023 -0500

    Fix pytests

commit 7960dfe
Author: Liam Greenlee <liam.a.greenlee@nasa.gov>
Date:   Tue Feb 7 14:54:01 2023 -0500

    black format fix

commit d40c478
Author: Liam Greenlee <liam.a.greenlee@nasa.gov>
Date:   Tue Feb 7 14:49:13 2023 -0500

    Add l0 parsing

commit 8a0f31c
Author: Liam Greenlee <liam.a.greenlee@nasa.gov>
Date:   Tue Feb 7 13:53:41 2023 -0500

    Add sci packet def

commit 63d70cb
Author: Liam Greenlee <liam.a.greenlee@nasa.gov>
Date:   Tue Feb 7 13:04:17 2023 -0500

    Add example l0 binary for testing

commit 338ece0
Author: Liam Greenlee <liam.a.greenlee@nasa.gov>
Date:   Wed Feb 1 11:31:35 2023 -0500

    Remove unbinning to use ccsdspy array type instead

commit 89de354
Author: Liam Greenlee <liam.a.greenlee@nasa.gov>
Date:   Wed Feb 1 11:17:10 2023 -0500

    Reformatting with black

commit 29f1d5a
Merge: 04cb3ff c121c02
Author: Liam Greenlee <liam.a.greenlee@nasa.gov>
Date:   Wed Feb 1 11:11:54 2023 -0500

    Merge branch 'main' of https://github.com/HERMES-SOC/hermes_eea

commit 04cb3ff
Author: Liam Greenlee <liam.a.greenlee@nasa.gov>
Date:   Thu Dec 15 10:57:18 2022 -0500

    Add accum packet unbinning functions
@Alrobbertz
Update Formatting
dbc927d
@Alrobbertz
Remove dependency. Use Spacepy Library functions.
3feb84f
@codecov Codecov
Copy link

codecov bot commented Jan 10, 2024 •
edited
Loading

Codecov Report

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

Comparison is base (1d4e023) 91.07% compared to head (af059d2) 75.81%.

Files Patch % Lines
hermes_eea/util/time/ccsds_to_cdf_time.py 42.62% 35 Missing ⚠️
hermes_eea/calibration/calibration.py 75.51% 12 Missing ⚠️
hermes_eea/io/EEA.py 85.29% 5 Missing ⚠️
hermes_eea/io/file_tools.py 63.63% 4 Missing ⚠️
Additional details and impacted files 
@@             Coverage Diff             @@
##             main      #28       +/-   ##
===========================================
- Coverage   91.07%   75.81%   -15.26%     
===========================================
  Files           4        8        +4     
  Lines          56      277      +221     
===========================================
+ Hits           51      210      +159     
- Misses          5       67       +62

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

@ehsteve
Copy link
Member

ehsteve commented Jan 14, 2024

This should be closed right @Alrobbertz?

@Alrobbertz Alrobbertz closed this Jan 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Alrobbertz @dbarrous @ehsteve