Skip to content

Recovered develop#581

Merged
richardjgowers merged 8 commits into
developfrom
recovered_develop
Dec 12, 2015
Merged

Recovered develop#581
richardjgowers merged 8 commits into
developfrom
recovered_develop

Conversation

@mnmelo

@mnmelo mnmelo commented Dec 12, 2015

Copy link
Copy Markdown
Member

@richardjgowers saves the day from a mistaken clobber of #575 and #578 merges (by me, of course).

sseyler and others added 8 commits December 9, 2015 16:26
@sseyler
Using TempDir() for testing PSA
c89734b
@sseyler
Merge branch 'develop' of https://github.com/MDAnalysis/mdanalysis in…
a11c561 
…to develop
@sseyler
Fixed usage of tempdir
9716b52
@sseyler
Fixed typo
692fdf0
@sseyler
Now using tempfile.mkdtemp() and shutil to delete
bf75c7e
@orbeckst
Merge pull request #575 from sseyler/develop
a125286 
Tests for PSA now use tempdir

Fixes Issue #557
@richardjgowers
Fixes Issue #576
50101f5 
Added fix for missing libgfortran

Tagged persistencelength scipy tests as optional

Removed verbose from nosetests, caused travis page to be slow to use
@richardjgowers
Merge pull request #578 from MDAnalysis/issue-576
e2065be 
Fixes Issue #576
richardjgowers added a commit that referenced this pull request Dec 12, 2015
@richardjgowers
Merge pull request #581 from MDAnalysis/recovered_develop
4a7e3cf 
Recovered develop
@richardjgowers richardjgowers merged commit 4a7e3cf into develop Dec 12, 2015
@richardjgowers richardjgowers deleted the recovered_develop branch December 12, 2015 01:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@mnmelo @richardjgowers @sseyler @orbeckst