setup for lint, shift python versions

Author: timkpaine

.github/workflows/build.yml

@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [2.7, 3.6, 3.7, 3.8]
+        python-version: [3.6, 3.7, 3.8, 3.9]
         os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
@@ -29,6 +29,10 @@ jobs:
         python -m pip install -e .[dev]
         python -m pip install -U wheel twine setuptools
 
+    - name: Lint
+      run: |
+        python -m flake8 ffn setup.py
+
     - name: Test
       run: |
         python -m nose --with-coverage --cover-package bt

.github/workflows/deploy.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [2.7, 3.6, 3.7, 3.8]
+        python-version: [3.6, 3.7, 3.8, 3.9]
 
     steps:
     - uses: actions/checkout@v2
@@ -27,6 +27,10 @@ jobs:
         python -m pip install -e .[dev]
         python -m pip install -U wheel twine setuptools
 
+    - name: Lint
+      run: |
+        python -m flake8 ffn setup.py
+
     - name: Test
       run: |
         python -m nose --with-coverage --cover-package bt

MANIFEST.in

@@ -12,3 +12,4 @@ global-exclude *.pyd
 global-exclude *.pyc
 global-exclude .git*
 global-exclude .DS_Store
+global-exclude .mypy_cache

Makefile

@@ -2,7 +2,17 @@ TMPREPO=/tmp/docs/bt
 
 default: build_dev
 
-.PHONY: dist upload docs pages serve klink notebooks
+.PHONY: dist upload docs pages serve klink notebooks test lint fix
+
+test:
+	python -m nose --with-coverage --cover-package bt
+
+lint:
+	python -m flake8 bt setup.py
+
+fix:
+	python -m black bt setup.py
+
 
 dist:
 	python setup.py sdist

bt/core.py

@@ -2,14 +2,14 @@
 Contains the core building blocks of the framework.
 """
 from __future__ import division
-from future.utils import iteritems
+
 import math
 from copy import deepcopy
 
-import pandas as pd
-import numpy as np
 import cython as cy
-
+import numpy as np
+import pandas as pd
+from future.utils import iteritems
 
 PAR = 100.
 TOL = 1e-16

setup.cfg

@@ -0,0 +1,11 @@
+[bdist_wheel]
+universal=1
+
+[metadata]
+description_file = README.rst
+
+[flake8]
+ignore=E203, W503
+max-line-length=180
+per-file-ignores=
+    bt/__init__.py:F401,F403

setup.py

@@ -1,9 +1,10 @@
-from setuptools import setup
-from setuptools.extension import Extension
 import codecs
 import os
 import re
 
+from setuptools import setup
+from setuptools.extension import Extension
+
 
 def local_file(filename):
     return codecs.open(
@@ -43,20 +44,23 @@ def local_file(filename):
     license='MIT',
     install_requires=[
         'ffn>=0.3.5',
-        'pyprind>=2.10'
+        'pyprind>=2.11'
     ],
     extras_require={
         'dev': [
+            "black>=20.8b1",
             'codecov',
             'coverage',
             'cython>=0.25',
+            "flake8",
+            "flake8-black",
             'future',
             'mock',
             'nose',
             'numpy>=1',
             'pandas>=0.19',
-            'matplotlib>=2,<3',
-            'ffn>=0.3.4',
+            'matplotlib>=2',
+            'ffn>=0.3.5',
             'pyprind>=2.11',
         ],
     },