From c684028adfd15787c59809f3ae570ba8e833d960 Mon Sep 17 00:00:00 2001 From: rht Date: Thu, 20 Dec 2018 06:14:47 +0000 Subject: [PATCH 1/8] quantecon/tests: Fix F401 unused imports --- quantecon/tests/test_arma.py | 1 - quantecon/tests/test_dle.py | 3 --- quantecon/tests/test_filter.py | 2 -- quantecon/tests/test_gridtools.py | 2 -- quantecon/tests/test_kalman.py | 1 - quantecon/tests/test_lqcontrol.py | 2 -- quantecon/tests/test_lqnash.py | 1 - quantecon/tests/test_lss.py | 1 - quantecon/tests/test_matrix_eqn.py | 4 ---- quantecon/tests/test_quadsum.py | 5 +---- quantecon/tests/test_rank_nullspace.py | 2 -- quantecon/tests/test_robustlq.py | 2 -- 12 files changed, 1 insertion(+), 25 deletions(-) diff --git a/quantecon/tests/test_arma.py b/quantecon/tests/test_arma.py index 17a9b5fb3..806f5e40b 100644 --- a/quantecon/tests/test_arma.py +++ b/quantecon/tests/test_arma.py @@ -4,7 +4,6 @@ """ import sys -import os import unittest import numpy as np from numpy.testing import assert_array_equal diff --git a/quantecon/tests/test_dle.py b/quantecon/tests/test_dle.py index 526bd1120..68e70e836 100644 --- a/quantecon/tests/test_dle.py +++ b/quantecon/tests/test_dle.py @@ -3,12 +3,9 @@ """ import sys -import os import unittest import numpy as np -from scipy.linalg import LinAlgError from numpy.testing import assert_allclose -from numpy import dot from quantecon.dle import DLE ATOL = 1e-10 diff --git a/quantecon/tests/test_filter.py b/quantecon/tests/test_filter.py index 0f105737a..a5f5282f2 100644 --- a/quantecon/tests/test_filter.py +++ b/quantecon/tests/test_filter.py @@ -4,9 +4,7 @@ """ -import sys import os -import unittest import pandas as pd import numpy as np from numpy.testing import assert_allclose diff --git a/quantecon/tests/test_gridtools.py b/quantecon/tests/test_gridtools.py index ab0e12ac9..c84cda369 100644 --- a/quantecon/tests/test_gridtools.py +++ b/quantecon/tests/test_gridtools.py @@ -73,7 +73,6 @@ def test_performance_C(): # print(prod.shape) # compute the same produce using numpy: - import numpy t3 = time.time() for i in range(100): @@ -108,7 +107,6 @@ def test_performance_F(): # print(prod.shape) # compute the same produce using numpy: - import numpy t3 = time.time() for i in range(100): diff --git a/quantecon/tests/test_kalman.py b/quantecon/tests/test_kalman.py index 3ce5b3677..0d994668a 100644 --- a/quantecon/tests/test_kalman.py +++ b/quantecon/tests/test_kalman.py @@ -3,7 +3,6 @@ """ import sys -import os import unittest import numpy as np from numpy.testing import assert_allclose diff --git a/quantecon/tests/test_lqcontrol.py b/quantecon/tests/test_lqcontrol.py index de0373698..e43ab7744 100644 --- a/quantecon/tests/test_lqcontrol.py +++ b/quantecon/tests/test_lqcontrol.py @@ -3,10 +3,8 @@ """ import sys -import os import unittest import numpy as np -from scipy.linalg import LinAlgError from numpy.testing import assert_allclose from numpy import dot from quantecon.lqcontrol import LQ diff --git a/quantecon/tests/test_lqnash.py b/quantecon/tests/test_lqnash.py index aedcb9378..5bea129b8 100644 --- a/quantecon/tests/test_lqnash.py +++ b/quantecon/tests/test_lqnash.py @@ -3,7 +3,6 @@ """ import sys -import os import unittest import numpy as np from numpy.testing import assert_allclose diff --git a/quantecon/tests/test_lss.py b/quantecon/tests/test_lss.py index b9014d0f4..7935e55cf 100644 --- a/quantecon/tests/test_lss.py +++ b/quantecon/tests/test_lss.py @@ -3,7 +3,6 @@ """ import sys -import os import unittest import numpy as np from numpy.testing import assert_allclose diff --git a/quantecon/tests/test_matrix_eqn.py b/quantecon/tests/test_matrix_eqn.py index 2330b2b7f..e2bc911d8 100644 --- a/quantecon/tests/test_matrix_eqn.py +++ b/quantecon/tests/test_matrix_eqn.py @@ -2,12 +2,8 @@ Tests for quantecon.util """ -from collections import Counter -import unittest import numpy as np from numpy.testing import assert_allclose -from nose.plugins.attrib import attr -import pandas as pd from quantecon import matrix_eqn as qme diff --git a/quantecon/tests/test_quadsum.py b/quantecon/tests/test_quadsum.py index d078681dc..24ff94d91 100644 --- a/quantecon/tests/test_quadsum.py +++ b/quantecon/tests/test_quadsum.py @@ -2,9 +2,6 @@ Tests for quadsums.py """ -import sys -import os -import unittest import numpy as np from numpy.testing import assert_allclose from quantecon.quadsums import var_quadratic_sum, m_quadratic_sum @@ -63,4 +60,4 @@ def test_m_matsum(): test_simplesum() test_identitysum() test_m_simplesum() - test_m_identitysum \ No newline at end of file + test_m_identitysum diff --git a/quantecon/tests/test_rank_nullspace.py b/quantecon/tests/test_rank_nullspace.py index 4227ad57a..20a07da12 100644 --- a/quantecon/tests/test_rank_nullspace.py +++ b/quantecon/tests/test_rank_nullspace.py @@ -3,11 +3,9 @@ """ import sys -import os import unittest import numpy as np from numpy.linalg import matrix_rank as np_rank -from numpy.testing import assert_allclose from quantecon.rank_nullspace import rank_est, nullspace diff --git a/quantecon/tests/test_robustlq.py b/quantecon/tests/test_robustlq.py index c8a9f7270..7c2871631 100644 --- a/quantecon/tests/test_robustlq.py +++ b/quantecon/tests/test_robustlq.py @@ -3,10 +3,8 @@ """ import sys -import os import unittest import numpy as np -from scipy.linalg import LinAlgError from numpy.testing import assert_allclose from quantecon.lqcontrol import LQ from quantecon.robustlq import RBLQ From 928c66d558d3a622cae085ad08cf21228ac14232 Mon Sep 17 00:00:00 2001 From: rht Date: Thu, 20 Dec 2018 06:17:11 +0000 Subject: [PATCH 2/8] quantecon/util: Fix F401 unused imports --- quantecon/util/array.py | 1 - quantecon/util/notebooks.py | 1 - quantecon/util/tests/test_timing.py | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/quantecon/util/array.py b/quantecon/util/array.py index 9b18e9ebe..3821a06a9 100644 --- a/quantecon/util/array.py +++ b/quantecon/util/array.py @@ -8,7 +8,6 @@ """ -import numpy as np from numba import jit # ----------------- # diff --git a/quantecon/util/notebooks.py b/quantecon/util/notebooks.py index 28f5d3532..5c006c553 100644 --- a/quantecon/util/notebooks.py +++ b/quantecon/util/notebooks.py @@ -20,7 +20,6 @@ """ import os -import warnings #-Remote Structure-# REPO = "https://github.com/QuantEcon/QuantEcon.notebooks" diff --git a/quantecon/util/tests/test_timing.py b/quantecon/util/tests/test_timing.py index 87e7b9491..b857ae052 100644 --- a/quantecon/util/tests/test_timing.py +++ b/quantecon/util/tests/test_timing.py @@ -6,7 +6,7 @@ import time from sys import platform from numpy.testing import assert_allclose -from nose.tools import eq_, ok_ +from nose.tools import ok_ from quantecon.util import tic, tac, toc, loop_timer From 7458e661c771323d9ae23dcc22217fa722757d4a Mon Sep 17 00:00:00 2001 From: rht Date: Thu, 20 Dec 2018 06:18:16 +0000 Subject: [PATCH 3/8] quantecon/markov: Fix F401 unused imports --- quantecon/markov/random.py | 1 - quantecon/markov/tests/test_approximation.py | 2 -- quantecon/markov/tests/test_random.py | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/quantecon/markov/random.py b/quantecon/markov/random.py index 22fa347c6..b82da695d 100644 --- a/quantecon/markov/random.py +++ b/quantecon/markov/random.py @@ -4,7 +4,6 @@ """ import numpy as np import scipy.sparse -from numba import jit from .core import MarkovChain from .ddp import DiscreteDP diff --git a/quantecon/markov/tests/test_approximation.py b/quantecon/markov/tests/test_approximation.py index 25ea8c2b8..4d6a6df07 100644 --- a/quantecon/markov/tests/test_approximation.py +++ b/quantecon/markov/tests/test_approximation.py @@ -3,10 +3,8 @@ """ import sys -import os import unittest import numpy as np -from numpy.testing import assert_allclose from quantecon.markov import tauchen, rouwenhorst #from quantecon.markov.approximation import rouwenhorst diff --git a/quantecon/markov/tests/test_random.py b/quantecon/markov/tests/test_random.py index ff5c1e309..472066294 100644 --- a/quantecon/markov/tests/test_random.py +++ b/quantecon/markov/tests/test_random.py @@ -6,7 +6,7 @@ from numpy.testing import ( assert_array_equal, assert_raises, assert_array_almost_equal_nulp ) -from nose.tools import eq_, ok_, raises +from nose.tools import eq_, ok_ from quantecon.markov import ( random_markov_chain, random_stochastic_matrix, random_discrete_dp From ccdfeed7bda5c9a4fea34f9245ae209bcdf85bea Mon Sep 17 00:00:00 2001 From: rht Date: Thu, 20 Dec 2018 06:18:38 +0000 Subject: [PATCH 4/8] quantecon.arma: Fix F401 unused imports --- quantecon/arma.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quantecon/arma.py b/quantecon/arma.py index 6865bafb9..0b438f9fd 100644 --- a/quantecon/arma.py +++ b/quantecon/arma.py @@ -5,7 +5,7 @@ """ import numpy as np -from numpy import conj, pi +from numpy import conj from .util import check_random_state From f5d37bc6ca839e5d0e494581d0e44f0c3a8a9b46 Mon Sep 17 00:00:00 2001 From: rht Date: Thu, 20 Dec 2018 06:19:02 +0000 Subject: [PATCH 5/8] quantecon/optimize: Fix F401 unused imports --- quantecon/optimize/scalar_maximization.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quantecon/optimize/scalar_maximization.py b/quantecon/optimize/scalar_maximization.py index 56144b330..7b07099fd 100644 --- a/quantecon/optimize/scalar_maximization.py +++ b/quantecon/optimize/scalar_maximization.py @@ -1,5 +1,5 @@ import numpy as np -from numba import jit, njit +from numba import njit @njit def brent_max(func, a, b, args=(), xtol=1e-5, maxiter=500): From a21b6a293edbc9b0f4bd98f33d901f08baf7c097 Mon Sep 17 00:00:00 2001 From: rht Date: Thu, 20 Dec 2018 06:19:35 +0000 Subject: [PATCH 6/8] quantecon/game_theory: Fix F401 unused imports --- quantecon/game_theory/tests/test_repeated_game.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quantecon/game_theory/tests/test_repeated_game.py b/quantecon/game_theory/tests/test_repeated_game.py index 508a189b5..23648918f 100644 --- a/quantecon/game_theory/tests/test_repeated_game.py +++ b/quantecon/game_theory/tests/test_repeated_game.py @@ -4,7 +4,7 @@ """ import numpy as np from numpy.testing import assert_allclose -from quantecon.game_theory import Player, NormalFormGame, RepeatedGame +from quantecon.game_theory import NormalFormGame, RepeatedGame class TestAS(): From ef37a58b4abf9f558de119f41da566ecb7d093dc Mon Sep 17 00:00:00 2001 From: rht Date: Thu, 20 Dec 2018 06:30:18 +0000 Subject: [PATCH 7/8] Disable flake8 on __init__.py files --- quantecon/__init__.py | 1 + quantecon/game_theory/__init__.py | 1 + quantecon/game_theory/game_generators/__init__.py | 1 + quantecon/markov/__init__.py | 1 + quantecon/optimize/__init__.py | 1 + quantecon/random/__init__.py | 1 + quantecon/tests/__init__.py | 1 + quantecon/util/__init__.py | 3 ++- 8 files changed, 9 insertions(+), 1 deletion(-) diff --git a/quantecon/__init__.py b/quantecon/__init__.py index 29b6adb01..0ac4363a1 100644 --- a/quantecon/__init__.py +++ b/quantecon/__init__.py @@ -1,3 +1,4 @@ +# flake8: noqa """ Import the main names to top level. """ diff --git a/quantecon/game_theory/__init__.py b/quantecon/game_theory/__init__.py index 1b13ed846..f8aea8bce 100644 --- a/quantecon/game_theory/__init__.py +++ b/quantecon/game_theory/__init__.py @@ -1,3 +1,4 @@ +# flake8: noqa """ Game Theory SubPackage diff --git a/quantecon/game_theory/game_generators/__init__.py b/quantecon/game_theory/game_generators/__init__.py index 83f811201..1dba09c33 100644 --- a/quantecon/game_theory/game_generators/__init__.py +++ b/quantecon/game_theory/game_generators/__init__.py @@ -1,3 +1,4 @@ +# flake8: noqa """ game_theory.game_generators diff --git a/quantecon/markov/__init__.py b/quantecon/markov/__init__.py index 4eb8aeb80..6e2a07df0 100644 --- a/quantecon/markov/__init__.py +++ b/quantecon/markov/__init__.py @@ -1,3 +1,4 @@ +# flake8: noqa """ Markov Chain SubPackge API """ diff --git a/quantecon/optimize/__init__.py b/quantecon/optimize/__init__.py index ea049aa03..9b5a2ef53 100644 --- a/quantecon/optimize/__init__.py +++ b/quantecon/optimize/__init__.py @@ -1,3 +1,4 @@ +# flake8: noqa """ Initialization of the optimize subpackage """ diff --git a/quantecon/random/__init__.py b/quantecon/random/__init__.py index 3d5f67415..89ac4fb45 100644 --- a/quantecon/random/__init__.py +++ b/quantecon/random/__init__.py @@ -1,3 +1,4 @@ +# flake8: noqa """ Random SubPackage ================= diff --git a/quantecon/tests/__init__.py b/quantecon/tests/__init__.py index d37314c89..bf65ae280 100644 --- a/quantecon/tests/__init__.py +++ b/quantecon/tests/__init__.py @@ -1,3 +1,4 @@ +# flake8: noqa """ namespace for quantecon.tests diff --git a/quantecon/util/__init__.py b/quantecon/util/__init__.py index 37778a0d0..7f899bc31 100644 --- a/quantecon/util/__init__.py +++ b/quantecon/util/__init__.py @@ -1,3 +1,4 @@ +# flake8: noqa """ API for QuantEcon Utilities """ @@ -5,4 +6,4 @@ from .array import searchsorted from .notebooks import fetch_nb_dependencies from .random import check_random_state -from .timing import tic, tac, toc, loop_timer \ No newline at end of file +from .timing import tic, tac, toc, loop_timer From 5524a47abce2d10faa8e45218877adcb1b7ad005 Mon Sep 17 00:00:00 2001 From: rht Date: Thu, 20 Dec 2018 06:31:20 +0000 Subject: [PATCH 8/8] Travis: Do F401 check before running the tests --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a0abc656a..d79595792 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,11 +41,12 @@ branches: - master install: - - pip install -U pip nose coveralls coverage numpy scipy pandas numba sympy ipython statsmodels + - pip install -U pip nose coveralls coverage numpy scipy pandas numba sympy ipython statsmodels flake8 - pip install tables - python setup.py install script: + - flake8 --select F401 quantecon - nosetests --with-coverage -a "!slow" --cover-package=quantecon after_success: