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.

Sign up for GitHub

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

Jump to bottom

Change py.test into pytest #509

Merged
merged 1 commit into from
Feb 3, 2022
Merged

Change py.test into pytest #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PROJ=django_celery_beat
PGPIDENT="Celery Security Team"
PYTHON=python
PYTEST=py.test
PYTEST=pytest
GIT=git
TOX=tox
ICONV=iconv
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def reqs(*f):


class pytest(setuptools.command.test.test):
user_options = [('pytest-args=', 'a', 'Arguments to pass to py.test')]
user_options = [('pytest-args=', 'a', 'Arguments to pass to pytest')]

def initialize_options(self):
setuptools.command.test.test.initialize_options(self)
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ sitepackages = False
recreate = False
commands =
pip list
py.test -xv
pytest -xv


[testenv:apicheck]
Expand Down Expand Up @@ -64,4 +64,4 @@ commands =
pip install -U https://github.com/celery/celery/zipball/master#egg=celery
pip install -U https://github.com/celery/kombu/zipball/master#egg=kombu
pip install Django
py.test -x --cov=django_celery_beat --cov-report=xml --no-cov-on-fail
pytest -x --cov=django_celery_beat --cov-report=xml --no-cov-on-fail