From 9dc144840dabec1fa738b2c65600344253abfe48 Mon Sep 17 00:00:00 2001 From: johnomotani Date: Fri, 25 Oct 2019 19:11:38 +0100 Subject: [PATCH 1/3] Make mayavi an optional dependency `mayavi` is not required for all the `boututils` to work, so make it an 'extra' requirement. --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index bd9939f..db9e003 100644 --- a/setup.py +++ b/setup.py @@ -51,9 +51,9 @@ 'boututils', 'future', 'bunch', - 'PyQt5', - 'mayavi', 'netCDF4'], + extras_require={ + 'mayavi': ['mayavi', 'PyQt5']}, classifiers=[ 'Programming Language :: Python :: 3', ('License :: OSI Approved :: ' From fc723b7bc5a956590322051889f4603ccb7a8607 Mon Sep 17 00:00:00 2001 From: johnomotani Date: Fri, 25 Oct 2019 19:15:06 +0100 Subject: [PATCH 2/3] Make mayavi optional in requirements.txt --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 292be85..ec9bd5d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,6 @@ h5py==2.9.0 scipy==1.2.1 future==0.17.1 bunch==1.0.1 -PyQt5==5.12.2 -mayavi==4.6.2 +PyQt5==5.12.2 [mayavi] +mayavi==4.6.2 [mayavi] netCDF4==1.5.1.2 From 6cf46fc7b4cf6f7d5ac5c7dafd34333c4f80023c Mon Sep 17 00:00:00 2001 From: johnomotani Date: Sat, 26 Oct 2019 17:33:02 +0100 Subject: [PATCH 3/3] Bump version number 0.1.2 -> 0.1.3 --- boututils/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boututils/__init__.py b/boututils/__init__.py index 7d851de..a3f8128 100644 --- a/boututils/__init__.py +++ b/boututils/__init__.py @@ -38,5 +38,5 @@ do_import.append('View3D') __all__ = do_import -__version__ = '0.1.2' +__version__ = '0.1.3' __name__ = 'boututils'