Use pytest-flake8 (#56)

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,20 +3,20 @@
       and one of the `docs/*-api.rst` files for new API
 
 
-<details> <summary>
-Howto run test cases and lint the code base </summary>
-  ```bash
-  $ py.test -v -s tricolour
-  ```
-If the pep8 tests fail, the quickest way to correct
-this is to run `autopep8` and then `flake8` and
-`pycodestyle` to fix the remaining issues.
+<details>
+<summary> Howto run test cases and lint the code base </summary>
+
+```bash
+$ py.test --flake8 -v -s tricolour
+```
+
+If you encounter flake8 failures, a quick way to correct
+this is to run `autopep8` and `flake8` again.
 
 ```bash
-$ pip install -U autopep8 flake8 pycodestyle
+$ pip install -U autopep8
 $ autopep8 -r -i tricolour
 $ flake8 tricolour
-$ pycodestyle tricolour
 ```
 
 </details>
@@ -25,11 +25,12 @@ $ pycodestyle tricolour
 <details>
 <summary> Howto build the documentation </summary>
 
-  To build the docs locally:
+To build the docs locally:
+
+```bash
+$ pip install -r requirements.readthedocs.txt
+$ cd docs
+$ READTHEDOCS=True make html
+```
 
-  ```
-  pip install -r requirements.readthedocs.txt
-  cd docs
-  READTHEDOCS=True make html
-  ```
 </details>

.travis.yml

@@ -3,7 +3,6 @@
 language: python
 python:
   - 3.6
-  - 3.5
 
 # Command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install: pip install -U tox-travis

HISTORY.rst

@@ -5,6 +5,7 @@ History
 0.1.3 (YYYY-MM-DD)
 ------------------
 
+* Use pytest-flake8 when running test cases (:pr:`56`)
 * Fix polarisation flagging for uncalibrated data (:pr:`55`)
 * Add ability to flag on total power (:pr:`55`)
 * Baseline statistics (:pr:`55`)

docker/python36.docker

@@ -2,15 +2,12 @@ FROM kernsuite/base:5
 
 # Install base requirements
 RUN docker-apt-install python3-pip
-RUN pip3 install --upgrade pip setuptools flake8
+RUN pip3 install --upgrade pip setuptools
 ADD . /code
 WORKDIR /code
 
 # Install base + testing packages
 RUN pip3 install .[testing]
 
-# Run tests
-RUN py.test -s -vvv .
-
-# Flake the repository
-RUN flake8 .
+# Run tests and flake at the same time
+RUN py.test --flake8 -s -vvv .

setup.cfg

@@ -1,8 +1,8 @@
 [bumpversion]
-current_version = 0.1.0
+current_version = 0.1.2
 commit = True
 tag = True
-tag_name = {current_version}
+tag_name = {new_version}
 
 
 [bumpversion:file:setup.py]
@@ -25,4 +25,4 @@ test = pytest
 
 [tool:pytest]
 collect_ignore = ['setup.py']
-
+norecursedirs  = docs

setup.py

@@ -27,7 +27,7 @@
     'zarr >= 2.3.1'
 ]
 
-extras_require = {'testing': ['pytest', 'requests']}
+extras_require = {'testing': ['pytest', 'pytest-flake8', 'requests']}
 
 setup(
     author="Simon Perkins",