aboutsummaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorBen Sturmfels <ben@sturm.com.au>2021-03-30 22:40:47 +1100
committerBen Sturmfels <ben@sturm.com.au>2021-03-30 22:40:47 +1100
commit39cc2055ca5534a15b0b77cd22a9d6f14117ebf1 (patch)
tree6e2b9bc26ca13c82394bbca6af315b6df50a9cab /setup.py
parentc7656e8264a2873df26ce0e63209359d97683f04 (diff)
downloadmediagoblin-39cc2055ca5534a15b0b77cd22a9d6f14117ebf1.tar.lz
mediagoblin-39cc2055ca5534a15b0b77cd22a9d6f14117ebf1.tar.xz
mediagoblin-39cc2055ca5534a15b0b77cd22a9d6f14117ebf1.zip
Fix pytest issues in Guix.
Key here was removing pytest-xdist from setup.py's "install_requires" list. Otherwise running the test suite under Guix would fail with something like: pkg_resources.ContextualVersionConflict: (pytest 5.3.5 (/gnu/store/9clwgf5svincpw3fbjcijdlw9mylyzn3-profile/lib/python3.8/site-packages), Requirement.parse('pytest>=6.0.0'), {'pytest-xdist'})
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index 1b1b9870..9decc2c1 100644
--- a/setup.py
+++ b/setup.py
@@ -43,8 +43,6 @@ install_requires = [
# WTForms removed the "ext" module in 3.0.
'wtforms>2.1,<3.0',
'py-bcrypt',
- 'pytest>=2.3.1',
- 'pytest-xdist',
'werkzeug>=0.7',
# Celery 4.3.0 drops the "sqlite" transport alias making our tests fail.
'celery>=3.0,<4.3.0',
@@ -80,6 +78,11 @@ install_requires = [
# 'Pillow',
]
+extras_require = [
+ 'pytest>=2.3.1',
+ 'pytest-xdist',
+]
+
with open(READMEFILE, encoding="utf-8") as fobj:
long_description = fobj.read()