Merge pull request #32 from ZhixuNi/develop

Add support to mzML from Bruker instruments. Upgrade GUI to pyside2

.travis.yml

@@ -1,15 +1,15 @@
 language: python
 
 python:
-- 3.6
+- 3.7
 
 matrix:
  include:
  - os: linux
  dist: bionic
  sudo: required
  language: python
- python: 3.6
+ python: 3.7
  install:
  - wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
  - bash miniconda.sh -b -p $HOME/miniconda
@@ -18,22 +18,25 @@ matrix:
  - conda config --set always_yes yes --set changeps1 no
  - conda update -q conda
  - conda info -a
- - conda config --add channels conda-forge
- - conda config --set channel_priority strict
- - conda env create -f conda_env_linux.yml
+ - conda create -n envlipidhunter python=3.7.6
  - source activate envlipidhunter
+ - pip install numpy
+ - pip install -r requirements.txt
  - conda env export > env.yml
  - ls
  - cat env.yml
  script:
  - travis_wait pytest --cov=./
  after_success:
  - travis_wait codecov
+ - conda env export > env.yml
+ - ls
+ - cat env.yml
 
  - os: osx
  sudo: required
  language: sh
- python: 3.6
+ python: 3.7
  install:
  - wget https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh
  - bash miniconda.sh -b -p $HOME/miniconda
@@ -42,27 +45,25 @@ matrix:
  - conda config --set always_yes yes --set changeps1 no
  - conda update -q conda
  - conda info -a
- - conda config --add channels conda-forge
- - conda config --set channel_priority strict
- - conda env create -f conda_env_mac.yml
+ - conda create -n envlipidhunter python=3.7.6
  - source activate envlipidhunter
  - ls
- - pip install cython pandas matplotlib natsort numba numpy numexpr scipy six pymzml codecov pytest pytest-cov xlwt xlrd openpyxl
+ - pip install numpy
+ - pip install -r requirements.txt
  - conda env export > env.yml
  - ls
  - cat env.yml
  script:
  - travis_wait pytest --cov=./
  after_success:
  - travis_wait codecov
- - conda install -c conda-forge pyside=1.2.4
  - conda env export > env.yml
  - ls
  - cat env.yml
 
  - os: windows
  language: sh
- python: 3.6
+ python: 3.7
  env: PATH="/c/tools/miniconda3/:/c/tools/miniconda3/Scripts:/c/tools/miniconda3/bin:$PATH"
  before_install:
  - choco install openssl.light
@@ -71,18 +72,16 @@ matrix:
  - hash -r
  - conda config --set always_yes yes --set changeps1 no
  - conda update -q conda
- - conda config --add channels conda-forge
- - conda config --set channel_priority strict
  - source activate base
- - conda create -c conda-forge -n envlipidhunter python=3.6.7
+ - conda create -n envlipidhunter python=3.7.6
  - source activate envlipidhunter
- - pip install cython pandas matplotlib natsort numba numpy numexpr scipy six pymzml codecov pytest pytest-cov xlwt xlrd openpyxl
+ - pip install numpy
+ - pip install -r requirements.txt
  - conda env export > env.yml
  - conda list
  - echo $PATH
  script:
  - travis_wait pytest --cov=./
  after_success:
  - travis_wait codecov
- - conda install -c conda-forge pyside=1.2.4
  - conda list