/mdanalysis

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

Port utils module to pytest #1434

Merged
merged 3 commits into from Jun 25, 2017

Conversation

Reviewers

@richardjgowers richardjgowers

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@utkbansal @jbarnoud @richardjgowers
@utkbansal
Member

utkbansal commented Jun 24, 2017 •
edited

Ths is a copy of PR 1419, have cleaned up the history here.

PR Checklist

  • Tests?
  • Docs?
  • CHANGELOG updated?
  • Issue raised/referenced?
@utkbansal

This comment has been minimized.

Sign in to view
Member

utkbansal commented Jun 24, 2017

@kain88-de See this is what I was saying - I don't even understand how am I getting commits from you and Oliver.

@utkbansal utkbansal changed the title from Trying to squash pytest utils branch to [WIP]Trying to squash pytest utils branch Jun 24, 2017

@utkbansal

This comment has been minimized.

Sign in to view
Member

utkbansal commented Jun 24, 2017

Woah, I squashed them into @richardjgowers's commit and it all disappeared.
@utkbansal

This comment has been minimized.

Sign in to view
Member

utkbansal commented Jun 24, 2017

Haha, even quantified code is confused now 😆

@utkbansal utkbansal referenced this pull request Jun 24, 2017

Closed

Port utils module #1419

0 of 4 tasks complete
@utkbansal
Port utils to pytest 
Move utils module to run with pytest

Get rid of staticmethods

Fixed import ordering
Verified
This commit was signed with a verified signature.
@utkbansal utkbansal Utkarsh Bansal
GPG key ID: 359A4CFC0731150A Learn about signing commits
2219daf
@utkbansal

This comment has been minimized.

Sign in to view
Member

utkbansal commented Jun 24, 2017

Something very fishy here, those commits and diff disappeared into thin air.
Or maybe I still don't completely understand git..
@jbarnoud

This comment has been minimized.

Sign in to view
Contributor

jbarnoud commented Jun 24, 2017

Can you detail the steps you followed?
@utkbansal

This comment has been minimized.

Sign in to view
Member

utkbansal commented Jun 24, 2017

Sure

  • I first squashed Richard's commits into one commit, Max & Oliver's commits into a single commit and my work into 2 commits
  • Then I squashed Max & Oliver's commit into Richard's commit
  • Then I rebased to remove the merge conflict
@utkbansal

This comment has been minimized.

Sign in to view
Member

utkbansal commented Jun 24, 2017 •
edited

What I didn't understand was why was I seeing commits from Max & Oliver on doing git rebase -i HEAD~x and not while doing git log --oneline.

And oddly there is a diff in the changelog!?
@richardjgowers

richardjgowers requested changes Jun 24, 2017
View changes

.travis.yml Outdated
@@ -23,16 +23,16 @@ env:
- PYTHON_VERSION=2.7
- COVERALLS=false
- NOSE_FLAGS="--processes=2 --process-timeout=400 --no-open-files --with-timer --timer-top-n 50"
- NOSE_TEST_LIST="analysis auxiliary core topology utils"
- NOSE_TEST_LIST="analysis auxiliary coordinates core topology"

This comment has been minimized.

Sign in to view
Copy link
@richardjgowers

richardjgowers Jun 24, 2017

Member

this would revert the coordinates to use nose

richardjgowers and others added some commits Jun 22, 2017

@richardjgowers @utkbansal
Added pytest-raises 
Converted test_units to use parametrize

Some hacking of test_distances to use pytest features

Completed moving test_distances to pytest style

rewrote test_transformations into pytest style
Verified
This commit was signed with a verified signature.
@utkbansal utkbansal Utkarsh Bansal
GPG key ID: 359A4CFC0731150A Learn about signing commits
5122538
@utkbansal
Remove useless file 
Fix changelog
Verified
This commit was signed with a verified signature.
@utkbansal utkbansal Utkarsh Bansal
GPG key ID: 359A4CFC0731150A Learn about signing commits
Loading status checks…
cf0da0f

@utkbansal utkbansal changed the title from [WIP]Trying to squash pytest utils branch to Port utils module to pytest Jun 25, 2017

@utkbansal

This comment has been minimized.

Sign in to view
Member

utkbansal commented Jun 25, 2017

This should be good to be merged now!
@richardjgowers

richardjgowers approved these changes Jun 25, 2017
View changes

@richardjgowers richardjgowers merged commit 0c8522c into MDAnalysis:develop Jun 25, 2017
1 of 2 checks passed

1 of 2 checks passed

continuous-integration/travis-ci/pr The Travis CI build could not complete due to an error
Details
QuantifiedCode 64 minor issues introduced.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment