merge qiskit-aqua to my fork

.stestr.conf

@@ -1,2 +1,2 @@
 [DEFAULT]
-test_path=./test
+test_path=./test

.travis.yml

@@ -122,21 +122,32 @@ jobs:
   include:
     - stage: Checks and Tests
       <<: *stage_dependencies
-      name: "Spell, Style, Lint, Docs check"
+      name: "Pip, spell, style, lint, copyright and docs checks"
       if: tag IS blank
       install:
         # install spell check libraries
         - sudo apt-get -y install python3-enchant
         - sudo apt-get -y install hunspell-en-us
         - pip install pyenchant
         - pip install cplex
+        - pip install "cvxpy>1.0.0,<1.1.0"
+        - pip install https://github.com/rpmuller/pyquante2/archive/master.zip --progress-bar off
       script:
+        - pip check
         - make spell
         - make style
         - make lint
         - make copyright
         - make html SPHINXOPTS=-W
         - make doctest
+    - name: "Mypy check"
+      <<: *stage_dependencies
+      if: tag IS blank
+      python: 3.5
+      install:
+        - pip install cplex
+      script:
+        - make mypy
     - name: "Test Aqua 1 Python 3.7"
       <<: *stage_test_aqua
       if: tag IS blank
@@ -148,7 +159,7 @@ jobs:
             - aqua137.dep
       before_script:
         - pip install cplex
-        - pip install cvxopt
+        - pip install "cvxpy>1.0.0,<1.1.0"
         - export PYTHON="coverage3 run --source qiskit/aqua,qiskit/chemistry,qiskit/finance,qiskit/ml,qiskit/optimization --omit */gauopen/* --parallel-mode"
       script:
         - stestr --test-path test/aqua run --blacklist-file selection.txt 2> >(tee /dev/stderr out.txt > /dev/null)
@@ -164,7 +175,7 @@ jobs:
           paths: aqua138.dep
       python: 3.8
       before_script:
-        - pip install cvxopt
+        - pip install "cvxpy>1.0.0,<1.1.0"
       script:
         - stestr --test-path test/aqua run --blacklist-file selection.txt 2> >(tee /dev/stderr out.txt > /dev/null)
         - python tools/extract_deprecation.py -file out.txt -output aqua138.dep
@@ -179,7 +190,7 @@ jobs:
             - aqua237.dep
       before_script:
         - pip install cplex
-        - pip install cvxopt
+        - pip install "cvxpy>1.0.0,<1.1.0"
         - export PYTHON="coverage3 run --source qiskit/aqua,qiskit/chemistry,qiskit/finance,qiskit/ml,qiskit/optimization --omit */gauopen/* --parallel-mode"
       script:
         - stestr --test-path test/aqua run --whitelist-file selection.txt 2> >(tee /dev/stderr out.txt > /dev/null)
@@ -195,7 +206,7 @@ jobs:
           paths: aqua238.dep
       python: 3.8
       before_script:
-        - pip install cvxopt
+        - pip install "cvxpy>1.0.0,<1.1.0"
       script:
         - stestr --test-path test/aqua run --whitelist-file selection.txt 2> >(tee /dev/stderr out.txt > /dev/null)
         - python tools/extract_deprecation.py -file out.txt -output aqua238.dep
@@ -327,16 +338,8 @@ jobs:
       script:
         - stestr --test-path test/optimization run 2> >(tee /dev/stderr out.txt > /dev/null)
         - python tools/extract_deprecation.py -file out.txt -output optimization38.dep
-    - name: "Run pip check"
-      <<: *stage_dependencies
-      if: tag IS blank
-      script:
-        - pip install cplex
-        - pip install cvxopt
-        - pip install https://github.com/rpmuller/pyquante2/archive/master.zip --progress-bar off
-        - pip check
-    - stage: Deprecation Messages
-      name: "Print deprecation messages"
+    - stage: Deprecation Messages and Coverage
+      name: "Print deprecation msgs, combine all coverages and upload to Coveralls"
       if: tag IS blank
       workspaces:
         use:
@@ -352,25 +355,10 @@ jobs:
           - ml38
           - optimization37
           - optimization38
-      install:
-        # dummy install cmd to prevent travis from installing requirements.txt
-        - pip --version
-      script:
-        - sort -f -u aqua137.dep aqua138.dep aqua237.dep aqua238.dep chemistry37.dep chemistry38.dep finance37.dep finance38.dep ml37.dep ml38.dep optimization37.dep optimization38.dep || true
-    - stage: Coverage
-      name: "Combine all coverages and upload to Coveralls"
-      if: tag IS blank
-      workspaces:
-        use:
-          - aqua137
-          - aqua237
-          - chemistry37
-          - finance37
-          - ml37
-          - optimization37
       install:
         - pip install -U coverage coveralls diff-cover
       script:
+        - sort -f -u aqua137.dep aqua138.dep aqua237.dep aqua238.dep chemistry37.dep chemistry38.dep finance37.dep finance38.dep ml37.dep ml38.dep optimization37.dep optimization38.dep || true
         - coverage3 combine aqua1.dat aqua2.dat chemistry.dat finance.dat ml.dat optimization.dat
         - coveralls || true
         - coverage3 xml