From 62e484dc6892d6b4044ac7d1e0f3ba4c7e601587 Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Tue, 19 May 2015 12:04:43 -0400 Subject: [PATCH] Use setuptools extras for graphing requirements This commit switches the packages only required to generate graphs, mainly pandas and matplotlib, to be marked as extra requirements using setuptools extras. These requirements aren't needed for subunit2sql unless you want to generate graphs and they are fairly involved to install with many external dependencies. Change-Id: Iefc0bbed60ad8a42a2568060ce109072e3e4c920 --- README.rst | 9 --------- requirements.txt | 3 +-- setup.cfg | 5 +++++ 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/README.rst b/README.rst index 78af00f..73d8231 100644 --- a/README.rst +++ b/README.rst @@ -90,15 +90,6 @@ file or the DB connection info. Running this command will print to stdout the subunit v2 stream for the run specified by $RUN_ID, unless the --out_path argument is specified to write it to a file instead. -Installation Notes -================== - -To use the subunit2sql-graph command you need to install matplotlib, the graph -generation will not work without it installed. However it's not included in the -requirements file as a temporary measure to avoid some additional C dependencies -in CI. This will be corrected in a future bug fix release, but for the time -being this is a constraint. - Release Notes ============= diff --git a/requirements.txt b/requirements.txt index e960aef..cd02f34 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,7 @@ alembic>=0.4.1 oslo.config>=1.4.0.0a3 oslo.db -pbr>=0.6,<1.0 +pbr>=1.0.0 python-subunit>=0.0.18 six>=1.5.2 SQLAlchemy>=0.7.8 -pandas diff --git a/setup.cfg b/setup.cfg index ddb4a54..7c0c949 100644 --- a/setup.cfg +++ b/setup.cfg @@ -43,3 +43,8 @@ upload-dir = doc/build/html [wheel] universal = 1 + +[extras] +graph = + pandas + matplotlib