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

Checking whether this pull request makes sense #136

Merged
merged 10 commits into from
Jul 8, 2023
Merged

Checking whether this pull request makes sense #136

merged 10 commits into from
Jul 8, 2023

Conversation

lsawade
Copy link
Collaborator

@lsawade lsawade commented Feb 6, 2023

Hi Peter,

I think I didn't pull something from your branch at some point, and now it's fast-forwarding and rewinding and stuff. There were 0 merge conflicts, but before merging this I/we should go through at least some of the changes, just to see whether they make sense.

  • Tests are passing
  • No merge-conflicts
  • Am I breaking something?

@PeterMakus
Copy link
Collaborator

Hi Lucas,
it seems like you didn't add any changes to this merge request? It's just the two PRs from ´´dev´´ into your branch? Can you double-check?

@lsawade
Copy link
Collaborator Author

lsawade commented Feb 13, 2023

Did I mess something up...

@lsawade
Copy link
Collaborator Author

lsawade commented Feb 13, 2023

Hi Lucas,
it seems like you didn't add any changes to this merge request? It's just the two PRs from ´´dev´´ into your branch? Can you double-check?

I you look at the diff, I made a bunch of changes that are hiding in merges...

Copy link
Collaborator

@PeterMakus PeterMakus left a comment

Choose a reason for hiding this comment

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

seems ok to me. Please change the one point that I commented. Also, I am not sure wrt the impact of download_chunk_size_in_mb

@@ -813,7 +817,7 @@ def downloadwav(
# # Create handler to the log
if log_fh is None:
fh = logging.FileHandler(os.path.join('logs', 'download.log'))
fh.setLevel(logging.INFO)
fh.setLevel(logging.info)
Copy link
Collaborator

Choose a reason for hiding this comment

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

this is not correct. logging.info is a function, whereas logging.INFO is the actual logging level.

@codecov-commenter
Copy link

codecov-commenter commented Feb 13, 2023

Codecov Report

Merging #136 (7bb1fed) into dev (1cf9dde) will decrease coverage by 0.03%.
The diff coverage is 12.50%.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

@@            Coverage Diff             @@
##              dev     #136      +/-   ##
==========================================
- Coverage   33.74%   33.71%   -0.03%     
==========================================
  Files          37       37              
  Lines        4839     4855      +16     
  Branches      863      865       +2     
==========================================
+ Hits         1633     1637       +4     
- Misses       3112     3124      +12     
  Partials       94       94              
Impacted Files Coverage Δ
src/pyglimer/waveform/download.py 9.56% <6.66%> (ø)
src/pyglimer/waveform/request.py 19.28% <12.50%> (ø)
src/pyglimer/waveform/preprocessh5.py 13.61% <16.00%> (+0.83%) ⬆️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@PeterMakus
Copy link
Collaborator

looks good. Seems like there is an error with lint (So probably some cosmetic thing). We should probably have a separate action for linting and not run it together with unittest, sorry for that.
After the linting is fixed, we can merge

@PeterMakus
Copy link
Collaborator

@lsawade Can you check to fix the things that make the unittests fail? If I remember correctly it was only a listing issue. But otherwise I think this is almost mergeable.

@lsawade
Copy link
Collaborator Author

lsawade commented Feb 28, 2023

I have made some more mini-updates that I'm going to push and as part of that I'm going to fix the formatting errors.

@PeterMakus
Copy link
Collaborator

again some linting problems, but after you fixed this, we can merge.

@lsawade lsawade merged commit 42daa4b into dev Jul 8, 2023
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.

3 participants