Skip to content

Fix #4164 on OSX - #4204

Merged
embray merged 3 commits into
astropy:masterfrom
embray:testing/4164-2
Oct 1, 2015
Merged

Fix #4164 on OSX#4204
embray merged 3 commits into
astropy:masterfrom
embray:testing/4164-2

Conversation

@embray

@embray embray commented Sep 30, 2015

Copy link
Copy Markdown
Member

This is yet another PR for fixing #4164, this time we will ensure that it is fixed on OSX as well.

The milestone on this PR is v1.1.0, but the fix also needs to be backported to v1.0.x, which I will do with a separate PR.

@embray
Slight fix to the automatic build-on-import in development mode--prev…
af72e2e 
…iously this didn't update astropy.__version__, even though it's possible for the astropy.version module to not exist until after the auto-build.
@embray embray added testing Affects-dev PRs and issues that do not impact an existing Astropy release labels Sep 30, 2015
@embray embray added this to the v1.1.0 milestone Sep 30, 2015
@embray
Update to astropy_helpers that should fix astropy#4164 on OSX. The ch…
b2ddf5b 
…ange to the test runner to make sure its base path is always the absolute path improves consistency of behavior between Python 2 and Python 3, where __path__ is a relative path in the former, and an absolute path in the latter.
@embray

embray commented Sep 30, 2015

Copy link
Copy Markdown
Member Author

Confirmed this is fixed on OSX: https://travis-ci.org/astropy/astropy/jobs/82977992

One merely cosmetic thing I don't like though, is that this makes the "Running tests in..." part of the test header so verbose as to be unreadable:

============================= test session starts ==============================

platform darwin -- Python 2.7.10 -- py-1.4.30 -- pytest-2.7.3

rootdir: /private/var/folders/gw/_2jq29095y7b__wtby9dg_5h0000gn/T/astropy-test-NflPiE, inifile: setup.cfg

Running tests with Astropy version 1.1.dev1132.

Running tests in /private/var/folders/gw/_2jq29095y7b__wtby9dg_5h0000gn/T/astropy-test-NflPiE/lib.macosx-10.5-x86_64-2.7/astropy /private/var/folders/gw/_2jq29095y7b__wtby9dg_5h0000gn/T/astropy-test-NflPiE/docs.

Platform: Darwin-13.4.0-x86_64-i386-64bit

Executable: /Users/travis/miniconda/envs/test/bin/python

It should be easy to modify the test header though, so that the common rootdir part of each directory in the "Running tests in" line is stripped off. So I think I'll do that...

embray added a commit that referenced this pull request Oct 1, 2015
@embray
Merge pull request #4204 from embray/testing/4164-2
0562d37 
Fix #4164 on OSX
@embray
embray merged commit 0562d37 into astropy:master Oct 1, 2015
@embray
embray deleted the testing/4164-2 branch October 1, 2015 14:00
@bsipocz

bsipocz commented Oct 1, 2015

Copy link
Copy Markdown
Member

👍 thanks

@embray

embray commented Dec 2, 2015

Copy link
Copy Markdown
Member Author

Looks like I never actually remembered to backport this. I'll do that now...

@embray

embray commented Dec 2, 2015

Copy link
Copy Markdown
Member Author

Well, looks like I did backport the relative change in astropy-helpers, but there were also some changes on the astropy side I didn't merge. I'm not completely sure those changes are necessary though...

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

Affects-dev PRs and issues that do not impact an existing Astropy release testing

Projects

None yet

Milestone

v1.1.0

Development

Successfully merging this pull request may close these issues.

2 participants

@embray @bsipocz