Skip to content

Revert premature pytest 3.x feature - #5697

Merged
mhvk merged 1 commit into
astropy:masterfrom
pllim:fix-doctest
Jan 13, 2017
Merged

mhvk merged 1 commit into
astropy:masterfrom
pllim:fix-doctest

Conversation

@pllim

@pllim pllim commented Jan 13, 2017 •

Copy link
Copy Markdown
Member

Revert a change introduced in #5678. That change should be re-introduced in #5688 instead. Fix #5695.

NOTE: Do not merge until it is sure that doctest reappears in Travis CI.

@pllim pllim added Affects-dev PRs and issues that do not impact an existing Astropy release Docs testing labels Jan 13, 2017
@mhvk mhvk added this to the v1.3.1 milestone Jan 13, 2017
@mhvk

mhvk commented Jan 13, 2017

Copy link
Copy Markdown
Contributor

The failure is fake -- I cancelled the OS build. Since tests pass and doctests are now included, I'll merge. Setting same milestone as #5678.

@mhvk
mhvk merged commit f1e885b into astropy:master Jan 13, 2017
@pllim
pllim deleted the fix-doctest branch January 15, 2017 00:41
@astrofrog astrofrog mentioned this pull request Jan 18, 2017
6 tasks done
bsipocz pushed a commit that referenced this pull request Feb 14, 2017
Revert premature pytest 3.x feature
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Affects-dev PRs and issues that do not impact an existing Astropy release Docs no-changelog-entry-needed testing

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants