From a071822d9966ac150e7ed3d4efffbf3feaa500f5 Mon Sep 17 00:00:00 2001
From: J08nY
Date: Thu, 27 Feb 2020 11:12:35 +0100
Subject: Fix travis.

---
 .travis.yml | 14 ++++++--------
 setup.py    |  4 ++--
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 401fb62..36f6ab9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,17 +12,15 @@ addons:
 install:
   - pip install codecov
   - mkdir pyecsca/codegen/tommath
-  - cd ext/libtommath/
-  - make
-  - cp libtommath.a ../../pyecsca/codegen/tommath/libtommath-HOST.a
-  - cp tommath.h ../../pyecsca/codegen/tommath/tommath.h
-  - cd ../
+  - cd ext/
+  - make host
+  - cp libtommath/tommath.h ../pyecsca/codegen/tommath/tommath.h
   - git clone https://github.com/J08nY/pyecsca
-  - cd pyecsca
+  - cd pyecsca/
   - git submodule update --init --recursive
-  - pip install -e .
+  - pip install -e ".[chipwhisperer]"
   - cd ../..
-  - pip install -e ".[test, typecheck]"
+  - pip install -e ".[test, dev]"
 
 script:
   - make -i typecheck
diff --git a/setup.py b/setup.py
index 7fed9bf..fc15c60 100644
--- a/setup.py
+++ b/setup.py
@@ -28,6 +28,7 @@ setup(
         python_requires='>=3.8',
         install_requires=[
             "pyecsca",
+            "chipwhisperer",
             "numpy",
             "scipy",
             "atpublic",
@@ -38,8 +39,7 @@ setup(
             "Click"
         ],
         extras_require={
-            "chipshiwperer": ["chipwhisperer"],
-            "typecheck": ["mypy"],
+            "dev": ["mypy", "flake8"],
             "test": ["nose2", "parameterized","green", "coverage"]
         },
         entry_points="""
-- 
cgit v1.3.1