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

Use pytest instead of py.test #502

Merged
merged 2 commits into from Oct 25, 2018

Conversation

sliverc
Copy link
Member

@sliverc sliverc commented Oct 24, 2018

py.test is the old way of running pytest.

Also remove DJANGO_SETTINGS_MODULE env when running tests. This is already defined in pytest.ini and py.test will take it from as it should also take parameters we might add in pytest.ini in the future.

I have overlooked this change in #498

Checklist

  • PR only contains one change (considered splitting up PR)
  • unit-test added
  • documentation updated
  • changelog entry added to CHANGELOG.md
  • author name in AUTHORS

@sliverc sliverc requested a review from n2ygk October 24, 2018 14:40
Copy link
Contributor

@n2ygk n2ygk left a comment

Choose a reason for hiding this comment

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

I was not aware pytest.ini set DJANGO_SETTINGS_MODULE. Thanks for that.
Please resolve the flake8 travis failure (caused by merging #501?).

py.test is the old way of running pytest.

Also remove DJANGO_SETTINGS_MODULE env when running tests

This is already defined in pytest.ini and py.test will take it from
as it should also take parameters we might add in pytest.ini in the future.
@sliverc
Copy link
Member Author

sliverc commented Oct 25, 2018

@n2ygk
Rebased with master and CI runs through now

@n2ygk
Copy link
Contributor

n2ygk commented Oct 25, 2018

@sliverc It's out of date again since you merged another PR. Should I just go ahead and click on "Update branch" and save you the time in the future?

@sliverc
Copy link
Member Author

sliverc commented Oct 25, 2018

@n2ygk
I have pressed update now. But feel free to update in the future. Or you can also approve the changes with the comment to update before merging. This way I can update and can merge in one go. Whatever you prefer.

@n2ygk n2ygk merged commit 860a096 into django-json-api:master Oct 25, 2018
@sliverc sliverc deleted the not_needed_django_settings branch October 25, 2018 19:22
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.

None yet

2 participants