Skip to content

Commit

Permalink
infrastructure: Stricter tox dependensies (#8119)
Browse files Browse the repository at this point in the history
  • Loading branch information
antonblr committed Dec 12, 2020
1 parent 902739c commit cf1051c
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 11 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/main.yml
Expand Up @@ -165,7 +165,10 @@ jobs:
with:
path: ~/.cache/pre-commit
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
- run: pip install tox
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install tox
- run: tox -e linting

deploy:
Expand Down
6 changes: 3 additions & 3 deletions setup.cfg
Expand Up @@ -42,7 +42,7 @@ install_requires =
attrs>=19.2.0
iniconfig
packaging
pluggy>=0.12,<1.0
pluggy>=0.12,<1.0.0a1
py>=1.8.2
toml
atomicwrites>=1.0;sys_platform=="win32"
Expand All @@ -52,8 +52,8 @@ python_requires = >=3.6
package_dir =
=src
setup_requires =
setuptools>=40.0
setuptools-scm
setuptools>=>=42.0
setuptools-scm>=3.4
zip_safe = no

[options.entry_points]
Expand Down
16 changes: 9 additions & 7 deletions tox.ini
@@ -1,6 +1,6 @@
[tox]
isolated_build = True
minversion = 3.5.3
minversion = 3.20.0
distshare = {homedir}/.tox/distshare
# make sure to update environment list in travis.yml and appveyor.yml
envlist =
Expand All @@ -16,6 +16,7 @@ envlist =
py37-freeze
docs
docs-checklinks
requires = pip >= 20.3.1

[testenv]
commands =
Expand Down Expand Up @@ -44,19 +45,20 @@ setenv =
extras = testing
deps =
doctesting: PyYAML
numpy: numpy
pexpect: pexpect
numpy: numpy>=1.19.4
pexpect: pexpect>=4.8.0
pluggymaster: git+https://github.com/pytest-dev/pluggy.git@master
pygments
pygments>=2.7.2
unittestextras: twisted
unittestextras: asynctest
xdist: pytest-xdist>=1.13
xdist: pytest-xdist>=2.1.0
xdist: -e .
{env:_PYTEST_TOX_EXTRA_DEP:}

[testenv:linting]
skip_install = True
basepython = python3
deps = pre-commit>=1.11.0
deps = pre-commit>=2.9.3
commands = pre-commit run --all-files --show-diff-on-failure {posargs:}

[testenv:docs]
Expand Down Expand Up @@ -141,7 +143,7 @@ passenv = *
deps =
colorama
github3.py
pre-commit>=1.11.0
pre-commit>=2.9.3
wheel
towncrier
commands = python scripts/release.py {posargs}
Expand Down

0 comments on commit cf1051c

Please sign in to comment.