Skip to content

Commit

Permalink
Merge pull request #143 from sarugaku/bump-pytest
Browse files Browse the repository at this point in the history
Bump pytest and pytest-rerunfailures versions
  • Loading branch information
oz123 committed Mar 4, 2023
2 parents e01cf4f + bb9ba25 commit be79c33
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 61 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Expand Up @@ -35,7 +35,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.7, 3.8, 3.9]
python-version: [3.7, 3.8, 3.9, "3.10", "3.11"]
os: [MacOS, Ubuntu, Windows]

steps:
Expand All @@ -54,7 +54,7 @@ jobs:
- name: Install latest pip, setuptools, wheel
run: |
python -m pip install --upgrade pip setuptools wheel --upgrade-strategy=eager
python -m pip install --upgrade --pre pipenv
python -m pip install --upgrade pipenv
- name: Run tests
env:
PIPENV_DEFAULT_PYTHON_VERSION: ${{ matrix.python-version }}
Expand All @@ -71,6 +71,6 @@ jobs:
run: |
git submodule sync
git submodule update --init --recursive
python -m pip install pipenv --pre --upgrade
python -m pip install pipenv --upgrade
python -m pipenv install --dev --python=${{ steps.python-path.outputs.path }}
python -m pipenv run coverage run --concurrency=thread -m pytest -p no:xdist -ra tests/
80 changes: 30 additions & 50 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions setup.cfg
Expand Up @@ -23,6 +23,7 @@ classifier =
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Topic :: Software Development :: Libraries :: Python Modules

[options]
Expand Down Expand Up @@ -50,15 +51,15 @@ dev =
parver
sphinx
sphinx-rtd-theme
twine
tests =
hypothesis
hypothesis-fspaths
pytest==4.6.10
pytest-rerunfailures<9.0
pytest>=5.6.10
pytest-rerunfailures
pytest-xdist
pytest-timeout
readme-renderer[md]
twine
typing =
mypy;python_version>="3.4"
mypy-extensions;python_version>="3.4"
Expand Down
10 changes: 5 additions & 5 deletions tox.ini
@@ -1,20 +1,20 @@
[tox]
envlist =
docs, packaging, py37, py38, py39, py310, coverage-report
docs, packaging, py37, py38, py39, py310, py311, coverage-report

[testenv]
passenv = CI GIT_SSL_CAINFO
setenv =
LC_ALL = en_US.UTF-8
deps =
-e .[tests]
coverage<5
-e .[tests,requests]
coverage
commands = coverage run --parallel-mode -m pytest -v -x --timeout 300 []
install_command = python -m pip install {opts} {packages}
usedevelop = True

[testenv:coverage-report]
deps = coverage<5
deps = coverage
skip_install = true
commands =
coverage combine
Expand All @@ -24,7 +24,7 @@ commands =
[testenv:docs]
deps =
-r{toxinidir}/docs/requirements.txt
-e .[tests]
-e .[requests,tests]
commands =
sphinx-build -d {envtmpdir}/doctrees -b html docs docs/build/html
sphinx-build -d {envtmpdir}/doctrees -b man docs docs/build/man
Expand Down

0 comments on commit be79c33

Please sign in to comment.