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

Fix duplication of column names in linking_trackpy #217

Merged
merged 3 commits into from
Dec 20, 2022

Conversation

w-k-jones
Copy link
Member

Fix for #216

Workaround for a trackpy bug was causing issues if the features dataframe already had x, y columns due to coords in the input data. This quick fix simply renames any columns with those names first to temporary names

  • Have you followed our guidelines in CONTRIBUTING.md?
  • Have you self-reviewed your code and corrected any misspellings?
  • Have you written documentation that is easy to understand?
  • Have you written descriptive commit messages?
  • Have you added NumPy docstrings for newly added functions?
  • Have you formatted your code using black?
  • If you have introduced a new functionality, have you added adequate unit tests?
  • Have all tests passed in your local clone?
  • If you have introduced a new functionality, have you added an example notebook?
  • Have you kept your pull request small and limited so that it is easy to review?
  • Have the newest changes from this branch been merged?

@w-k-jones w-k-jones added the bug Code that is failing or producing the wrong result label Dec 18, 2022
@w-k-jones w-k-jones added this to the Version 1.4.1 milestone Dec 18, 2022
@codecov
Copy link

codecov bot commented Dec 18, 2022

Codecov Report

Base: 39.22% // Head: 39.30% // Increases project coverage by +0.08% 🎉

Coverage data is based on head (384a201) compared to base (49c4c27).
Patch coverage: 100.00% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##           hotfix     #217      +/-   ##
==========================================
+ Coverage   39.22%   39.30%   +0.08%     
==========================================
  Files          11       11              
  Lines        2246     2249       +3     
==========================================
+ Hits          881      884       +3     
  Misses       1365     1365              
Flag Coverage Δ
unittests 39.30% <100.00%> (+0.08%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
tobac/tracking.py 66.07% <100.00%> (+0.93%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@w-k-jones
Copy link
Member Author

Also fixed some the notebook issues raised in #215 while testing this, I can also go through and make the other notebook fixes if others think this is worthwhile to do now

Copy link
Member

@freemansw1 freemansw1 left a comment

Choose a reason for hiding this comment

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

Thanks for the quick fix, @w-k-jones. I'm happy with this!

@freemansw1 freemansw1 added High Priority This issue needs immediate fixing, and may warrant a hotfix release Small Change A minor change which should be quick to address and review labels Dec 19, 2022
@w-k-jones w-k-jones merged commit 6c3fc8a into tobac-project:hotfix Dec 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Code that is failing or producing the wrong result High Priority This issue needs immediate fixing, and may warrant a hotfix release Small Change A minor change which should be quick to address and review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants