From a79136c0a8acbf5b5b8e2869ba8057d893a72b81 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Tue, 6 Nov 2018 21:30:09 -0600 Subject: [PATCH] Add Pyramid's testing requirements --- Makefile | 20 +++++++++++++++----- setup.py | 16 +++++++++++----- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 9857109..72f0a37 100644 --- a/Makefile +++ b/Makefile @@ -123,7 +123,9 @@ devel/testenv: devel || ( ${VIRTUALENV} devel/testenv ; \ devel/testenv/bin/pip install --upgrade pip ; \ devel/testenv/bin/pip install --upgrade setuptools ; \ - devel/testenv/bin/pip install tox) + devel/testenv/bin/pip install tox ; \ + devel/testenv/bin/pip install -e '.[testing]' ; \ + ) update_testenv: devel/testenv devel/testenv/bin/pip -U @@ -145,10 +147,14 @@ devel/pytest: devel dist devel/pytest/bin/pip install --upgrade wheel ; \ devel/pytest/bin/pip install dist/pgwui_logout-*.tar.gz ; \ devel/pytest/bin/pip install flake8 ; \ - devel/pytest/bin/pip install pytest-cov ; ) \ + devel/pytest/bin/pip install pytest-cov ; \ + devel/pytest/bin/pip install -e '.[testing]' ; \ + ) \ else \ ( devel/pytest/bin/pip uninstall -y pgwui_logout ; \ - devel/pytest/bin/pip install dist/pgwui_logout-*.tar.gz ) ; \ + devel/pytest/bin/pip install dist/pgwui_logout-*.tar.gz ; \ + devel/pytest/bin/pip install -e '.[testing]' ; \ + ) ; \ fi .PHONY: check @@ -164,10 +170,14 @@ devel/pudb: devel dist devel/pudb/bin/pip install --upgrade setuptools ; \ devel/pytest/bin/pip install --upgrade wheel ; \ devel/pudb/bin/pip install dist/pgwui_logout-*.tar.gz ; \ - devel/pudb/bin/pip install pudb ; ) \ + devel/pudb/bin/pip install -e '.[testing]' ; \ + devel/pudb/bin/pip install pudb ; \ + ) \ else \ ( devel/pudb/bin/pip uninstall -y pgwui_logout ; \ - devel/pudb/bin/pip install dist/pgwui_logout-*.tar.gz ) ; \ + devel/pudb/bin/pip install -e '.[testing]' ; \ + devel/pudb/bin/pip install dist/pgwui_logout-*.tar.gz ; \ + ) ; \ fi .PHONY: pudb diff --git a/setup.py b/setup.py index a843f83..c0eb8a2 100644 --- a/setup.py +++ b/setup.py @@ -57,6 +57,13 @@ with open(path.join(here, 'src', 'pgwui_logout', 'VERSION'), # Get the long description from the README file long_description = filter_readme() +# Pyramid testing requirements +tests_require = [ + 'WebTest >= 1.3.1', # py3 compat + 'pytest>=3.7.4', + 'pytest-cov', +] + setup( name='pgwui_logout', @@ -139,11 +146,10 @@ setup( # List additional groups of dependencies here (e.g. development # dependencies). You can install these using the following syntax, # for example: - # $ pip install -e .[dev,test] - # extras_require={ - # 'dev': ['check-manifest'], - # 'test': ['coverage'], - # }, + # $ pip install -e .[testing] + extras_require={ + 'testing': tests_require, + }, # If there are data files included in your packages that need to be # installed, specify them here. If using Python 2.6 or less, then these -- 2.34.1