Commit 07b925ae authored by Willi Rath's avatar Willi Rath
Browse files

Unpin matplotlib, py2.7.12, and remove texlive

Textlive holds back pyqt.  Removing it and un-pinning matplotlib and
python2.7 should allow for most recent stable and working versions.
parent 3dd8bda9
Loading
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ channels:
  - {willirath}
  - {anaconda}
dependencies:
  - python=2.7.12
  - python=2.7
  - anaconda-client
  - aospy
  - basemap
@@ -19,7 +19,7 @@ dependencies:
  - ipython
  - jupyter
  - line_profiler
  - matplotlib=1.5.3
  - matplotlib
  - nco
  - netCDF4
  - numpy
@@ -28,7 +28,6 @@ dependencies:
  - seaborn
  - seawater
  - spyder
  - texlive-core
  - xarray
  - pip:
      - pymatlab
+2 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ channels:
  - file://home/b/shkifmwr/TM/data/conda_mirror/willirath_local_mirror/
  - file://home/b/shkifmwr/TM/data/conda_mirror/anaconda_local_mirror/
dependencies:
  - python=2.7.12
  - python=2.7
  - anaconda-client
  - aospy
  - basemap
@@ -19,7 +19,7 @@ dependencies:
  - ipython
  - jupyter
  - line_profiler
  - matplotlib=1.5.3
  - matplotlib
  - nco
  - netCDF4
  - numpy
@@ -28,7 +28,6 @@ dependencies:
  - seaborn
  - seawater
  - spyder
  - texlive-core
  - xarray
  - pip:
      - pymatlab
+2 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ channels:
  - https://conda.anaconda.org/willirath
  - https://repo.continuum.io/pkgs/free
dependencies:
  - python=2.7.12
  - python=2.7
  - anaconda-client
  - aospy
  - basemap
@@ -19,7 +19,7 @@ dependencies:
  - ipython
  - jupyter
  - line_profiler
  - matplotlib=1.5.3
  - matplotlib
  - nco
  - netCDF4
  - numpy
@@ -28,7 +28,6 @@ dependencies:
  - seaborn
  - seawater
  - spyder
  - texlive-core
  - xarray
  - pip:
      - pymatlab
+2 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ channels:
  - file://media/wrath/wrath_003/conda_mirror/willirath_local_mirror/
  - file://media/wrath/wrath_003/conda_mirror/anaconda_local_mirror/
dependencies:
  - python=2.7.12
  - python=2.7
  - anaconda-client
  - aospy
  - basemap
@@ -19,7 +19,7 @@ dependencies:
  - ipython
  - jupyter
  - line_profiler
  - matplotlib=1.5.3
  - matplotlib
  - nco
  - netCDF4
  - numpy
@@ -28,7 +28,6 @@ dependencies:
  - seaborn
  - seawater
  - spyder
  - texlive-core
  - xarray
  - pip:
      - pymatlab
+2 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ channels:
  - https://conda.anaconda.org/willirath
  - https://repo.continuum.io/pkgs/free
dependencies:
  - python=2.7.12
  - python=2.7
  - anaconda-client
  - aospy
  - basemap
@@ -19,7 +19,7 @@ dependencies:
  - ipython
  - jupyter
  - line_profiler
  - matplotlib=1.5.3
  - matplotlib
  - nco
  - netCDF4
  - numpy
@@ -28,7 +28,6 @@ dependencies:
  - seaborn
  - seawater
  - spyder
  - texlive-core
  - xarray
  - pip:
      - pymatlab