From 4c612303bbcfeaa7a4c20fa105300d7c23224166 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Wed, 12 Oct 2022 12:29:13 +0200 Subject: [PATCH 1/2] misc: declare w.c.s. dependencies in setup.py (#70163) --- setup.py | 14 ++++++++++++++ tox.ini | 19 +++---------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/setup.py b/setup.py index fec7ada63..abe05e5b3 100644 --- a/setup.py +++ b/setup.py @@ -169,6 +169,9 @@ setup( maintainer_email="fpeters@entrouvert.com", url="http://wcs.labs.libre-entreprise.org", install_requires=[ + 'Quixote>=3.0,<3.2', + 'django>=2.2', + 'psycopg2', 'bleach<5', 'dnspython', 'gadjo>=0.53', @@ -181,6 +184,17 @@ setup( 'pyquery', 'unidecode', 'lxml', + 'vobject', + 'qrcode', + 'Pillow', + 'gadjo', + 'docutils', + 'django-ckeditor@git+https://git.entrouvert.org/debian/django-ckeditor.git', + 'XStatic-godo@git+https://git.entrouvert.org/godo.js.git', + 'langdetect', + 'python-magic', + 'workalendar', + 'requests', ], package_dir={'wcs': 'wcs'}, packages=find_packages(), diff --git a/tox.ini b/tox.ini index cc849a87d..25e971eb0 100644 --- a/tox.ini +++ b/tox.ini @@ -18,6 +18,7 @@ setenv = passenv = USER deps = +# test dependencies pytest>=3.6 pytest-mock pytest-cov @@ -26,29 +27,15 @@ deps = pytest-freezegun WebTest mechanize - gadjo pyquery mock - requests responses - vobject - qrcode - Pillow - workalendar - python-magic - docutils - langdetect - git+https://git.entrouvert.org/debian/django-ckeditor.git - git+https://git.entrouvert.org/godo.js.git - django22: django>=2.2,<2.3 - django-ratelimit<3 - pyproj astroid!=2.5.7 pylint - Quixote>=3.0,<3.2 pre-commit pyzbar - bleach +# others... + django22: django>=2.2,<2.3 commands = py.test {posargs:-v {env:COVERAGE:} --numprocesses={env:NUMPROCESSES:1} --dist loadfile --junitxml=junit-{envname}.xml tests/} codestyle: pre-commit run --all-files --show-diff-on-failure -- 2.37.2