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

Remove grep dependency, parse help string in python #67

Merged
merged 2 commits into from Apr 17, 2018

Conversation

justinsalamon
Copy link
Contributor

Calling grep breaks pysox (and subsequently) scaper on windows. This PR addresses this be removing the use of grep altogether and parsing the sox help string directly in python.

Addresses issue #66 in pysox, issue justinsalamon/scaper#25 in scaper

@coveralls
Copy link

Coverage Status

Coverage increased (+0.002%) to 98.753% when pulling 3f71336 on justinsalamon:nogrep into 3ed47c9 on rabitt:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.002%) to 98.753% when pulling 6f92a54 on justinsalamon:nogrep into 3ed47c9 on rabitt:master.

@coveralls
Copy link

coveralls commented Jan 19, 2018

Coverage Status

Coverage increased (+0.003%) to 98.754% when pulling 9d0e1de on justinsalamon:nogrep into 3ed47c9 on rabitt:master.

@justinsalamon
Copy link
Contributor Author

@rabitt this is ready for CR and merge, just 6 lines.

@rabitt
Copy link
Collaborator

rabitt commented Feb 11, 2018

Looks good to me @justinsalamon , thanks for the PR.

@mthaak can you confirm that this works on windows?

@rabitt
Copy link
Collaborator

rabitt commented Feb 11, 2018

Also @justinsalamon can you squash the commits into one?

@justinsalamon
Copy link
Contributor Author

@rabitt did that (squashing) work?

@rabitt
Copy link
Collaborator

rabitt commented Mar 1, 2018

@justinsalamon no I still see 5 commits in the PR.

Also waiting for @mthaak (or anyone with a windows machine) to confirm this PR fixes the problem on windows.

@justinsalamon
Copy link
Contributor Author

justinsalamon commented Mar 1, 2018

@rabitt apparently you can setup the repo to have a "squash and merge" button instead of just a "merge" button - maybe the cleanest option (commits stay in branch, but squashed on master)?

https://blog.github.com/2016-04-01-squash-your-commits/

Original commit:
Cast to string if check_output returns bytes instead of str (python 3 compatibility)
Squashed commits:
[6f92a54] Cleanup
[3f71336] Remove grep dependency, parse help string in python

Cleanup

Cast to string if check_output returns bytes instead of str (python 3 compatibility)
@rabitt
Copy link
Collaborator

rabitt commented Apr 17, 2018

Thanks for this @justinsalamon , and thanks for reporting @mthaak.

@rabitt rabitt merged commit fe6f242 into marl:master Apr 17, 2018
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.

None yet

3 participants