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

pytest migration + enable Python 3.10 #464

Merged
merged 4 commits into from
Apr 3, 2022
Merged

pytest migration + enable Python 3.10 #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a42f409
switch to pytest
pgajdos Jun 26, 2020
746e530
more pytest transitions
pgajdos Jun 26, 2020
c68ee50
Merge branch 'master' of https://github.com/alecthomas/voluptuous int…
spacegaier Apr 3, 2022
91e7f9c
Convert remaining tests to pytest
spacegaier Apr 3, 2022
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
13 changes: 7 additions & 6 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@ jobs:
fail-fast: false
matrix:
include:
- { python-version: "3.9", session: "flake8" }
- { python-version: "3.9", session: "py39" }
- { python-version: "3.8", session: "py38" }
- { python-version: "3.7", session: "py37" }
- { python-version: "3.6", session: "py36" }
- { python-version: "2.7", session: "py27" }
- { python-version: "3.10", session: "flake8" }
- { python-version: "3.10", session: "py310" }
- { python-version: "3.9", session: "py39" }
- { python-version: "3.8", session: "py38" }
- { python-version: "3.7", session: "py37" }
- { python-version: "3.6", session: "py36" }
- { python-version: "2.7", session: "py27" }

steps:
- name: Check out the repository
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,9 +715,9 @@ s({'password':'123', 'password_again': 1337})

## Running tests

Voluptuous is using nosetests:
Voluptuous is using pytest:

$ nosetests
$ pytest


## Other libraries and inspirations
Expand Down
4 changes: 4 additions & 0 deletions pytest.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[pytest]
python_files = tests.py
testpaths = voluptuous/tests
addopts = --doctest-glob=*.md -v
4 changes: 0 additions & 4 deletions setup.cfg
View file
Open in desktop

This file was deleted.

14 changes: 6 additions & 8 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = flake8,py27,py36,py37,py38,py39
envlist = flake8,py27,py36,py37,py38,py39,py310

[flake8]
; E501: line too long (X > 79 characters)
Expand All @@ -12,15 +12,13 @@ distribute = True
sitepackages = False
setuptools_version = setuptools<58.0
deps =
nose
nose-cover3
pytest
pytest-cov
coverage>=3.0
commands =
nosetests \
--with-coverage3 \
--cover3-package=voluptuous \
--cover3-branch \
--verbose {posargs}
pytest \
--cov=voluptuous \
voluptuous/tests/

[testenv:flake8]
deps = flake8
Expand Down
Loading