Skip to content

[EXP] changed yield to parameterize - #5678

Merged
mhvk merged 6 commits into
astropy:masterfrom
kelle:pytest3-fix
Jan 9, 2017
Merged

mhvk merged 6 commits into
astropy:masterfrom
kelle:pytest3-fix

Conversation

@kelle

@kelle kelle commented Jan 7, 2017

Copy link
Copy Markdown
Member

fixes a deprecated warning with pytest3. implemented fix in test_profiling.py but same fix didnt work in test_wcs.py. #hackaas cc @nden @pllim

Comment thread astropy/wcs/tests/test_profiling.py Outdated
n_map_files = 28

if len(hdr_map_file_list) != n_map_files:
assert False, (

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The construct was already in the file, but is truly odd, so might as well change:

assert len(hdr_map_file_list) == n_map_files, (<text as is>)

(and again below)

@mhvk

mhvk commented Jan 8, 2017

Copy link
Copy Markdown
Contributor

Nice refactoring; looks good to me modulo the one comment (which is really just to refactor a little further).

@mhvk

mhvk commented Jan 9, 2017

Copy link
Copy Markdown
Contributor

@kelle - now that I did #5682, I looked also at test_wcs which you mentioned did not work, and it has the same reason as for why my votable test failed. I'll make a PR to this branch shortly that should fix it!

kelle and others added 2 commits January 9, 2017 10:50
@mhvk

mhvk commented Jan 9, 2017

Copy link
Copy Markdown
Contributor

@kelle - I just made the PR to your branch with fixes to test_wcs. With that, I think this is all OK, and combined with #5682 at least our test suite is pytest 3.x ready!

@mhvk

mhvk commented Jan 9, 2017

Copy link
Copy Markdown
Contributor

p.s. the travis error is real:

astropy/wcs/tests/test_profiling.py:69:1: W391 blank line at end of file

kelle added 2 commits January 9, 2017 15:02
fixes for test_wcs. Yields removed to get rid of deprecation warnings in pytest3 and be compatible with pytest4
@mhvk

mhvk commented Jan 9, 2017

Copy link
Copy Markdown
Contributor

I think this all looks OK now, so will merge...

@mhvk
mhvk merged commit a18f6a7 into astropy:master Jan 9, 2017
@astrobot

astrobot commented Jan 9, 2017

Copy link
Copy Markdown

@mhvk - thanks for merging this! However, I noticed the following issues with this pull request:

  • The milestone has not been set
  • Changelog entry not present (or pull request number missing) and neither the Affects-dev nor the no-changelog-entry-needed label are set

Would it be possible to fix these? Thanks!

If you believe the above to be incorrect (which I - @astrobot - very much doubt) you can ping @astrofrog

@astrofrog astrofrog mentioned this pull request Jan 18, 2017
6 tasks done
bsipocz pushed a commit that referenced this pull request Feb 14, 2017
Change yield to parameterize in wcs tests for pytest 3.x compatibility.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants