Skip to content

Commit cf1051c

Browse files
authored
infrastructure: Stricter tox dependensies (#8119)
1 parent 902739c commit cf1051c

File tree

3 files changed

+16
-11
lines changed

3 files changed

+16
-11
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,10 @@ jobs:
165165
with:
166166
path: ~/.cache/pre-commit
167167
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
168-
- run: pip install tox
168+
- name: Install dependencies
169+
run: |
170+
python -m pip install --upgrade pip
171+
pip install tox
169172
- run: tox -e linting
170173

171174
deploy:

setup.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ install_requires =
4242
attrs>=19.2.0
4343
iniconfig
4444
packaging
45-
pluggy>=0.12,<1.0
45+
pluggy>=0.12,<1.0.0a1
4646
py>=1.8.2
4747
toml
4848
atomicwrites>=1.0;sys_platform=="win32"
@@ -52,8 +52,8 @@ python_requires = >=3.6
5252
package_dir =
5353
=src
5454
setup_requires =
55-
setuptools>=40.0
56-
setuptools-scm
55+
setuptools>=>=42.0
56+
setuptools-scm>=3.4
5757
zip_safe = no
5858

5959
[options.entry_points]

tox.ini

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
isolated_build = True
3-
minversion = 3.5.3
3+
minversion = 3.20.0
44
distshare = {homedir}/.tox/distshare
55
# make sure to update environment list in travis.yml and appveyor.yml
66
envlist =
@@ -16,6 +16,7 @@ envlist =
1616
py37-freeze
1717
docs
1818
docs-checklinks
19+
requires = pip >= 20.3.1
1920

2021
[testenv]
2122
commands =
@@ -44,19 +45,20 @@ setenv =
4445
extras = testing
4546
deps =
4647
doctesting: PyYAML
47-
numpy: numpy
48-
pexpect: pexpect
48+
numpy: numpy>=1.19.4
49+
pexpect: pexpect>=4.8.0
4950
pluggymaster: git+https://github.com/pytest-dev/pluggy.git@master
50-
pygments
51+
pygments>=2.7.2
5152
unittestextras: twisted
5253
unittestextras: asynctest
53-
xdist: pytest-xdist>=1.13
54+
xdist: pytest-xdist>=2.1.0
55+
xdist: -e .
5456
{env:_PYTEST_TOX_EXTRA_DEP:}
5557

5658
[testenv:linting]
5759
skip_install = True
5860
basepython = python3
59-
deps = pre-commit>=1.11.0
61+
deps = pre-commit>=2.9.3
6062
commands = pre-commit run --all-files --show-diff-on-failure {posargs:}
6163

6264
[testenv:docs]
@@ -141,7 +143,7 @@ passenv = *
141143
deps =
142144
colorama
143145
github3.py
144-
pre-commit>=1.11.0
146+
pre-commit>=2.9.3
145147
wheel
146148
towncrier
147149
commands = python scripts/release.py {posargs}

0 commit comments

Comments
 (0)