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

Updated functionality for add_rfree and copy_rfree #170

Merged
merged 8 commits into from
Jul 30, 2022
Merged

Updated functionality for add_rfree and copy_rfree #170

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
48b1e00
Updated functionality for add_rfree and copy_rfree
dennisbrookner Jul 27, 2022
7930bc8
Revisions to r-free functionality requested by Jack Greisman
dennisbrookner Jul 29, 2022
6a11ec3
Fix text of ValueError
dennisbrookner Jul 29, 2022
9bb78b2
Condensed test_copy_rfree_errors
dennisbrookner Jul 29, 2022
11c65a5
Make test_copy_rfree_errors more rigorous
dennisbrookner Jul 30, 2022
8435444
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 30, 2022
2ffdaeb
Remove unused import statements
dennisbrookner Jul 30, 2022
6315231
Merge branch 'rfree' of https://github.com/Hekstra-Lab/reciprocalspac…
dennisbrookner Jul 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/utils/test_rfree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def test_copy_rfree_errors(data_fmodel):
rs.utils.copy_rfree(data_fmodel, data_fmodel)

# Raise ValueError because "missing key" is missing,
# even though "R-free-flags" is present
# even though "R-free-flags" exists
JBGreisman marked this conversation as resolved.
Show resolved Hide resolved
data_with_standard_rfree = rs.utils.add_rfree(data_fmodel, inplace=False)
with pytest.raises(ValueError):
rs.utils.copy_rfree(
Expand Down