summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorBert JW Regeer <xistence@0x58.com>2020-05-28 16:58:54 -0700
committerGitHub <noreply@github.com>2020-05-28 16:58:54 -0700
commit412fadefabdddda7481fba1bc86958d2f3d10631 (patch)
tree7c0c549662d393d3657679b502f524dacd1cda79 /setup.py
parent683bc742f7b08db563f3385796809c09babf004b (diff)
parentb19492dbbe5cebbabb91f01ae312d951b39ee931 (diff)
downloadpyramid-412fadefabdddda7481fba1bc86958d2f3d10631.tar.gz
pyramid-412fadefabdddda7481fba1bc86958d2f3d10631.tar.bz2
pyramid-412fadefabdddda7481fba1bc86958d2f3d10631.zip
Merge pull request #3588 from Pylons/fix/pytest_runner
Fix: pytest runner
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index 1a334efe2..0596a0194 100644
--- a/setup.py
+++ b/setup.py
@@ -51,7 +51,11 @@ docs_extras = [
'sphinxcontrib-autoprogram',
]
-testing_extras = tests_require + ['coverage', 'pytest', 'pytest-cov']
+testing_extras = tests_require + [
+ 'coverage',
+ 'pytest>=5.4.2', # unittest.TestCase funkyness, see commit 77c1505ab
+ 'pytest-cov',
+]
branch_version = ".".join(VERSION.split(".")[:2])