diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 271b63b1ab357e1fd8c4b182e9b3d069877cb5b0..7903c82e9a8d8448f8084bb01e5662548b07adeb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -92,7 +92,7 @@ before_script: # Script from Ingo Heimbach: - apt-get update - - apt-get install -y curl bzip2 git + - apt-get install -y curl bzip2 git mesa-utils - curl -O -L https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh - chmod +x Miniconda3-latest-Linux-x86_64.sh - ./Miniconda3-latest-Linux-x86_64.sh -b -p /opt/miniconda3 diff --git a/environment.yml b/environment.yml index 47f705085c943ff3b72fa6795c2da458ef4a3392..e700f4dacee70eee2b94959ed3eec176d16517f7 100644 --- a/environment.yml +++ b/environment.yml @@ -22,14 +22,15 @@ dependencies: - pyFFTW=0.10 # File IO: - hyperspy=1.3 - - hyperspy-gui-ipywidgets=1.0 - - hyperspy-gui-traitsui=1.0 # TODO: Optional! Delete when mayavi is gone! + # - hyperspy-gui-ipywidgets=1.0 + # - hyperspy-gui-traitsui=1.0 # TODO: Optional! Delete when mayavi is gone! - h5py=2.7 # Plotting and colors: # TODO: Shift to plotting package? - matplotlib=2.0 # Only works with qt4 from conda-forge channel! - Pillow=4.1 - cmocean=1.1 - - qt=4.8 # Necessary because of traits in mayavi... + # - qt=4.8 # Necessary because of traits in mayavi... + - pyqt=5.6.0 - mayavi=4.5 # TODO: Get rid of! #- colorspacious # TODO: NOT USED? #- visvis # TODO: NOT USED?