Skip to content
This repository was archived by the owner on Nov 11, 2024. It is now read-only.

Port #189 to master - #190

Merged
embray merged 1 commit into
astropy:masterfrom
embray:fix-rootdir-issue-2
Sep 28, 2015
Merged

embray merged 1 commit into
astropy:masterfrom
embray:fix-rootdir-issue-2

Conversation

@embray

@embray embray commented Sep 21, 2015

Copy link
Copy Markdown
Member

This implements #189 against the master branch.

@embray

embray commented Sep 23, 2015

Copy link
Copy Markdown
Member Author

Rebased onto master.

…hat the setup.cfg is in the common root directory for the Python files and the docs. This ensures that in py.test >= 2.7 the correct common test directory can be found as the 'rootdir'. Seems to work fine with older versions of py.test as well (down to 2.4).
@embray
embray force-pushed the fix-rootdir-issue-2 branch from 64b5d75 to 6615810 Compare September 28, 2015 14:54
embray added a commit that referenced this pull request Sep 28, 2015
@embray
embray merged commit 8f2056d into astropy:master Sep 28, 2015
@embray
embray deleted the fix-rootdir-issue-2 branch September 28, 2015 16:30
embray added a commit to embray/astropy that referenced this pull request Sep 28, 2015
…eral previous fixes from other PRs. Also updated astropy.tests.command to incorporate the changes from astropy/astropy-helpers#190
embray added a commit to embray/astropy that referenced this pull request Sep 29, 2015
…eral previous fixes from other PRs. Also updated astropy.tests.command to incorporate the changes from astropy/astropy-helpers#190
embray added a commit to embray/astropy that referenced this pull request Sep 29, 2015
…eral previous fixes from other PRs. Also updated astropy.tests.command to incorporate the changes from astropy/astropy-helpers#190
embray added a commit to embray/astropy that referenced this pull request Oct 1, 2015
…eral previous fixes from other PRs. Also updated astropy.tests.command to incorporate the changes from astropy/astropy-helpers#190
dhomeier pushed a commit to dhomeier/astropy that referenced this pull request Dec 17, 2015
…eral previous fixes from other PRs. Also updated astropy.tests.command to incorporate the changes from astropy/astropy-helpers#190
dhomeier pushed a commit to dhomeier/astropy that referenced this pull request Jun 12, 2016
…eral previous fixes from other PRs. Also updated astropy.tests.command to incorporate the changes from astropy/astropy-helpers#190
@bsipocz bsipocz modified the milestones: v1.0.4, v1.1.0 May 29, 2017
drdavella pushed a commit to astropy/pytest-remotedata that referenced this pull request Sep 20, 2017
…eral previous fixes from other PRs. Also updated astropy.tests.command to incorporate the changes from astropy/astropy-helpers#190
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants