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

Port utils module to pytest #1434

Merged
merged 3 commits into from Jun 25, 2017
Merged

Conversation

utkbansal
Copy link
Member

@utkbansal utkbansal commented Jun 24, 2017

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

PR Checklist

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

@utkbansal
Copy link
Member Author

@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 Trying to squash pytest utils branch [WIP]Trying to squash pytest utils branch Jun 24, 2017
@utkbansal utkbansal force-pushed the squash branch 2 times, most recently from b46c67d to 15739d5 Compare June 24, 2017 14:56
@utkbansal
Copy link
Member Author

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

@utkbansal
Copy link
Member Author

Haha, even quantified code is confused now 😆

Move utils module to run with pytest

Get rid of staticmethods

Fixed import ordering
@utkbansal
Copy link
Member Author

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

@jbarnoud
Copy link
Contributor

Can you detail the steps you followed?

@utkbansal
Copy link
Member Author

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
Copy link
Member Author

utkbansal commented Jun 24, 2017

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!?

.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"
Copy link
Member

Choose a reason for hiding this comment

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

this would revert the coordinates to use nose

@utkbansal utkbansal force-pushed the squash branch 3 times, most recently from 7e447a7 to d15869c Compare June 25, 2017 06:35
richardjgowers and others added 2 commits June 25, 2017 12:09
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
Fix changelog
@utkbansal utkbansal changed the title [WIP]Trying to squash pytest utils branch Port utils module to pytest Jun 25, 2017
@utkbansal
Copy link
Member Author

This should be good to be merged now!

@richardjgowers richardjgowers merged commit 0c8522c into MDAnalysis:develop Jun 25, 2017
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