update to keep matplotlib as an optional install

usnistgov · Feb 15, 2023 · 4ce88bb · 4ce88bb
1 parent ced11fe
commit 4ce88bb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/environment-tools.yaml b/environment-tools.yaml
@@ -1,5 +1,6 @@
 # packages for development
 dependencies:
+  - matplotlib
   # linting
   # - black
   # - blackdoc

diff --git a/environment.yaml b/environment.yaml
@@ -5,7 +5,6 @@ channels:
 dependencies:
   - python>=3.8
   - sympy
-  - matplotlib
   - numpy
   - scipy
   - xarray

diff --git a/setup.cfg b/setup.cfg
@@ -41,7 +41,6 @@ install_requires =
     cmomy >= 0.1.9
     custom-inherit
     attrs
-    matplotlib
 
 
 [options.packages.find]
@@ -54,8 +53,8 @@ accel =
 parallel =
     dask[complete]
 
-# viz =
-#     matplotlib
+viz =
+    matplotlib
 
 mbar =
     pymbar<4.0
@@ -73,7 +72,7 @@ all =
     %(gpr)s
     %(accel)s
     %(parallel)s
-    # %(viz)s
+    %(viz)s
 
 
 

diff --git a/tox.ini b/tox.ini
@@ -179,8 +179,8 @@ conda_deps =
 
 
 deps =
-    pypi-remote: {[base]package_name}[all]
-    pypi-local: {posargs}[all]
+    pypi-remote: {[base]package_name}[mbar,gpr]
+    pypi-local: {posargs}[mbar,gpr]
     conda: tensorflow
     conda: tensorflow-probability
     conda: gpflow
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ channels: @@
     dependencies:
       - python>=3.8
       - sympy
-      - matplotlib
       - numpy
       - scipy
       - xarray
@@ Expand Down @@