Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update several files to match package_template #581

Merged
merged 2 commits into from
Jun 5, 2016

Conversation

yeganer
Copy link
Contributor

@yeganer yeganer commented Jun 4, 2016

With this change we will always use the latest version of
astropy.tests.pytest_plugins because we don't redefine their functions.

Some cleanup was done, too.

Currently pytest_configure and pytest_unconfigure are still defined in
tardis/conftest.py but these will be removed by a future commit by
@karandesai-96.

This fixes issue with config_dir and astropy> 1.1

@wkerzendorf
Copy link
Member

@yeganer are we done here? If so - you can merge.

With this change we will always use the latest version of
astropy.tests.pytest_plugins because we don't redefine their functions.

Some cleanup was done, too.

Currently pytest_configure and pytest_unconfigure are still defined in
tardis/conftest.py but these will be removed by a future commit by
@karandesai-96.
@yeganer
Copy link
Contributor Author

yeganer commented Jun 5, 2016

@wkerzendorf I'll merge once travis finished for the rebase.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants