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

Switch test runners from nose to pytest #149

Merged
merged 5 commits into from Feb 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion .coveragerc
@@ -1,8 +1,11 @@
# configuration of coverage.py
# https://coverage.readthedocs.io

[run]
source = ephyviewer
branch = true

[report]
omit =
ephyviewer/icons/icons_py2_Qt4.py
ephyviewer/icons/make_resources.py
ephyviewer/tests/*
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Expand Up @@ -89,7 +89,7 @@ jobs:

- name: Run tests
run: |
nosetests --with-coverage --cover-package=ephyviewer
pytest -v --cov

- name: Report coverage to Coveralls
run: coveralls
Expand Down
115 changes: 107 additions & 8 deletions .gitignore
@@ -1,9 +1,108 @@
doc/_build/*
build/*
dist/*
ephyviewer.egg-info/*
*.avi
*.csv
/.idea
/venv
# Specific to this project
video*.avi
example_dev_mood_encoder.csv

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
.hypothesis/
.pytest_cache/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
doc/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# pyenv
.python-version

# celery beat schedule file
celerybeat-schedule

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
62 changes: 0 additions & 62 deletions ephyviewer/.gitignore

This file was deleted.

4 changes: 2 additions & 2 deletions ephyviewer/tests/test_timefreqviewer.py
Expand Up @@ -4,7 +4,7 @@
from ephyviewer.tests.testing_tools import make_fake_signals


def test_traceviewer(interactive=False):
def test_timefreqviewer(interactive=False):
source = make_fake_signals()


Expand All @@ -27,4 +27,4 @@ def test_traceviewer(interactive=False):


if __name__=='__main__':
test_traceviewer(interactive=True)
test_timefreqviewer(interactive=True)
2 changes: 1 addition & 1 deletion ephyviewer/tests/testing_tools.py
Expand Up @@ -80,7 +80,7 @@ def make_video_file(filename, codec='mpeg4', rate=25.): # mpeg4 mjpeg libx264
#~ ax.set_title()
#~ line.set_markersize(i)
fig.canvas.draw()
one_img = np.fromstring(fig.canvas.tostring_rgb(), dtype='u1').reshape(h,w,3)
one_img = np.frombuffer(fig.canvas.tostring_rgb(), dtype='u1').reshape(h,w,3)
one_img = one_img[:,:,::-1].copy()
#~ one_img = one_img .swapaxes(0,1).copy()

Expand Down
3 changes: 2 additions & 1 deletion requirements-tests.txt
@@ -1,5 +1,6 @@
av
coveralls
neo
nose
pandas
pytest
pytest-cov