fixup! Fix CI?

Author: mundya

.travis.yml

@@ -1,6 +1,10 @@
 # Travis Configuration based on that used for rig_c_sa
 sudo: false  # Use the container based system
-language: generic  # Make no assumptions about the environment
+language: python  # Build under Python to avoid needing to compile Numpy
+python:
+  - 2.7
+  - 3.4
+  - 3.5
 
 # Install packages for building and running the test suite
 addons:
@@ -10,43 +14,21 @@ addons:
       - valgrind
       - libffi-dev
 
-# Test against a number of python versions
-env:
-  matrix:
-    - PYVER=2.7
-    - PYVER=3.4
-    - PYVER=3.5
-
-
 install:
-  - git clone https://github.com/yyuu/pyenv.git ~/.pyenv
-  - PYENV_ROOT="${HOME}/.pyenv"
-  - PATH="$PYENV_ROOT/bin:$PATH"
-  - eval "$(pyenv init -)"
-  # Install the latest release of the specified Python version using pyenv.
-  - PYVER="$(pyenv install --list | grep -E "^\\s*$PYVER" | sort -n -t. -k3 | tail -n1)"
-  - echo "Selected Python $PYVER"
-  - pyenv install $PYVER
-  # Make the newly installed version the default "python" command.
-  - pyenv global $PYVER
-  - python --version
-  # Install PIP
-  - curl -O https://bootstrap.pypa.io/get-pip.py
-  - python get-pip.py --user
   - pip install -r requirements-test.txt
 
 script:
   # Run the C tests first
   - cd c_tests
   - make coverage
   - cd -
-  # Then check that the package can be built and run the tests
+  # Then check that the package can be built, and run the Python tests
   - python setup.py develop
   - >
       py.test py_tests \
               --cov rig_routing_tables \
               --cov tests
-  - flake8 rig_routing_tables tests
+  - flake8 rig_routing_tables py_tests
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)

rig_routing_tables/mtrie.py

@@ -28,7 +28,7 @@ def minimise(table, target_length):
 
     [1]_ Ahmad, S. and Mahapatra, R.N., 2007. An efficient approach to on-chip
     logic minimization. *Very Large Scale Integration (VLSI) Systems, IEEE
-    Transactions on*, 15(9), pp.1040-1050. 
+    Transactions on*, 15(9), pp.1040-1050.
     """
     # Convert the table to C format and minimise
     c_table = rig_to_c_table(table)

setup.cfg

@@ -0,0 +1,2 @@
+[pep8]
+ignore = */__init__.py