From fcb56e8ce087feb7770d3347007a056f32a26d46 Mon Sep 17 00:00:00 2001 From: jajupmochi Date: Sun, 27 Sep 2020 11:53:02 +0200 Subject: [PATCH] Test extras_require. --- requirements.txt | 4 ++-- requirements_pypi.txt | 4 ++-- setup.py | 6 +++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index f0a7cbc..16a6f1b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,8 +5,8 @@ networkx>=2.2 scikit-learn>=0.20.0 tabulate>=0.8.2 tqdm>=4.26.0 -control>=0.8.2; matplotlib>=3.1.0 # for generalized random walk kernels only. -control<0.8.2; matplotlib<3.1.0 +# control>=0.8.2; matplotlib>=3.1.0 # for generalized random walk kernels only. +# control<0.8.2; matplotlib<3.1.0 cvxpy>=1.0.31 # for preimage. Does not work for "pip install graphkit-learn". # -e https://files.pythonhosted.org/packages/11/d0/d900870dc2d02ea74961b90c353666c6528a33ea61a10aa59a0d5574ae59/cvxpy-1.0.31.tar.gz # for preimage. cvxopt>=1.2.5 # for preimage. diff --git a/requirements_pypi.txt b/requirements_pypi.txt index 64b0652..44fa634 100644 --- a/requirements_pypi.txt +++ b/requirements_pypi.txt @@ -5,8 +5,8 @@ networkx>=2.2 scikit-learn>=0.20.0 tabulate>=0.8.2 tqdm>=4.26.0 -control>=0.8.2; matplotlib>=3.1.0 # for generalized random walk kernels only. -control<0.8.2; matplotlib<3.1.0 +# control>=0.8.2; matplotlib>=3.1.0 # for generalized random walk kernels only. +# control<0.8.2; matplotlib<3.1.0 # cvxpy>=1.0.31 # for preimage. Does not work for "pip install graphkit-learn". # -e https://files.pythonhosted.org/packages/11/d0/d900870dc2d02ea74961b90c353666c6528a33ea61a10aa59a0d5574ae59/cvxpy-1.0.31.tar.gz # for preimage. cvxopt>=1.2.5 # for preimage. diff --git a/setup.py b/setup.py index a84679e..b1b9f9c 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ with open('requirements_pypi.txt') as fp: setuptools.setup( name="graphkit-learn", - version="0.2b2", + version="0.2b3", author="Linlin Jia", author_email="linlin.jia@insa-rouen.fr", description="A Python library for graph kernels, graph edit distances, and graph pre-images", @@ -22,4 +22,8 @@ setuptools.setup( "Operating System :: OS Independent", ], install_requires=install_requires, + extras_require={ + 'control>=0.8.2': ['matplotlib>=3.1.0'], # for generalized random walk kernels only. + 'control<0.8.2': ['matplotlib<3.1.0'] + }, )