Merge changes from dev

  Changes:
  - Add support for ensembles under Classifier interface
  - Add data generators
  - Add fit_generator to classifiers and adversarial trainer
  - Add C&W L_inf attack
  - Add master seed for random number generators
  - Add an adversarial detector based on features & some feature implementations
  - Add pylint to Travis & code clean-up
  - Restructure analyzers from poisoning module

Author: Irina Nicolae

.pylintrc

@@ -2,34 +2,26 @@ sudo: required
 dist: trusty
 language: python
 env:
+  - KERAS_BACKEND=tensorflow TENSORFLOW_V=1.5.0
+  - KERAS_BACKEND=tensorflow TENSORFLOW_V=1.6.0
+  - KERAS_BACKEND=tensorflow TENSORFLOW_V=1.7.0
+  - KERAS_BACKEND=tensorflow TENSORFLOW_V=1.10.0
+python:
+  - "2.7"
+  - "3.5"
 matrix:
   include:
-      - python: 2.7
-        env: KERAS_BACKEND=tensorflow TENSORFLOW_V=1.5.0
-      - python: 2.7
-        env: KERAS_BACKEND=tensorflow TENSORFLOW_V=1.6.0
-      - python: 2.7
-        env: KERAS_BACKEND=tensorflow TENSORFLOW_V=1.7.0
-      - python: 2.7
-        env: KERAS_BACKEND=tensorflow TENSORFLOW_V=1.10.0
-      - python: 3.5
-        env: KERAS_BACKEND=tensorflow TENSORFLOW_V=1.5.0
-      - python: 3.5
-        env: KERAS_BACKEND=tensorflow TENSORFLOW_V=1.6.0
-      - python: 3.5
-        env: KERAS_BACKEND=tensorflow TENSORFLOW_V=1.7.0
-      - python: 3.5
-        env: KERAS_BACKEND=tensorflow TENSORFLOW_V=1.10.0
-  exclude:
-      - env:
+    - python: 3.5
+      env: KERAS_BACKEND=tensorflow TENSORFLOW_V=1.10.0
+      script:
+        - (pycodestyle --max-line-length=120 art || exit 0) && (pylint -rn art || exit 0)
 
 before_install:
   - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
       wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh;
     else
       wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
     fi
-  - sed -i "s/tensorflow/tensorflow==${TENSORFLOW_V}/" requirements.txt
   - sed -i "s/tensorflow/tensorflow==${TENSORFLOW_V}/" test_requirements.txt
   - bash miniconda.sh -b -p $HOME/miniconda
   - export PATH="$HOME/miniconda/bin:$PATH"
@@ -39,13 +31,11 @@ before_install:
   - conda update -q conda
   - conda info -a
 
-install: 
+install:
   - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION --yes --file requirements.txt
-  # Can't specify channels in requirements.txt for conda
-  # - conda install -y pytorch -c pytorch
   - source activate test-environment
   - pip install -q -r test_requirements.txt
-#  - pip install -e .[tests] | cat
+  - pip install pylint pycodestyle
   - conda install libgcc
   - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/travis/miniconda/envs/test-environment/lib
   - export PYTHONPATH=".":$PYTHONPATH

.travis.yml

@@ -2,7 +2,7 @@
 Module providing adversarial attacks under a common interface.
 """
 from art.attacks.attack import Attack
-from art.attacks.carlini import CarliniL2Method
+from art.attacks.carlini import CarliniL2Method, CarliniLInfMethod
 from art.attacks.deepfool import DeepFool
 from art.attacks.fast_gradient import FastGradientMethod
 from art.attacks.iterative_method import BasicIterativeMethod