From 440472f37e7a3cf5ae0669efa0c08b6a2c4121d0 Mon Sep 17 00:00:00 2001 From: Anton Agestam Date: Fri, 8 Dec 2017 14:06:09 +0100 Subject: [PATCH] fix pep8 and bump version --- collectfast/etag.py | 3 ++- collectfast/tests/utils.py | 3 ++- runtests.py | 7 +++++-- setup.cfg | 5 ----- setup.py | 2 +- tox.ini | 7 ++++++- 6 files changed, 16 insertions(+), 11 deletions(-) delete mode 100644 setup.cfg diff --git a/collectfast/etag.py b/collectfast/etag.py index 00ca763..321220d 100644 --- a/collectfast/etag.py +++ b/collectfast/etag.py @@ -87,7 +87,8 @@ def get_file_hash(storage, path): file_hash = cache.get(cache_key, False) if file_hash is False: buffer = BytesIO() - zf = gzip.GzipFile(mode='wb', compresslevel=6, fileobj=buffer, mtime=0.0) + zf = gzip.GzipFile( + mode='wb', compresslevel=6, fileobj=buffer, mtime=0.0) zf.write(force_bytes(contents)) zf.close() file_hash = hashlib.md5(buffer.getvalue()).hexdigest() diff --git a/collectfast/tests/utils.py b/collectfast/tests/utils.py index 9bc8d4f..25f774c 100644 --- a/collectfast/tests/utils.py +++ b/collectfast/tests/utils.py @@ -69,7 +69,8 @@ def override_storage_attr(name, value): def decorator(fn): @functools.wraps(fn) def wrapper(*args, **kwargs): - storage = import_string(getattr(django_settings, 'STATICFILES_STORAGE')) + storage = import_string( + getattr(django_settings, 'STATICFILES_STORAGE')) original = getattr(storage, name) setattr(storage, name, value) ret = fn(*args, **kwargs) diff --git a/runtests.py b/runtests.py index c155c59..e623b1f 100755 --- a/runtests.py +++ b/runtests.py @@ -12,10 +12,12 @@ def main(): parser = OptionParser() - parser.add_option("--DATABASE_ENGINE", dest="DATABASE_ENGINE", default="sqlite3") + parser.add_option( + "--DATABASE_ENGINE", dest="DATABASE_ENGINE", default="sqlite3") parser.add_option("--DATABASE_NAME", dest="DATABASE_NAME", default="") parser.add_option("--DATABASE_USER", dest="DATABASE_USER", default="") - parser.add_option("--DATABASE_PASSWORD", dest="DATABASE_PASSWORD", default="") + parser.add_option( + "--DATABASE_PASSWORD", dest="DATABASE_PASSWORD", default="") parser.add_option("--TEST", dest="TEST_SUITE", default=None) options, args = parser.parse_args() @@ -88,5 +90,6 @@ def main(): shutil.rmtree(staticfiles_dir) shutil.rmtree(staticroot_dir) + if __name__ == "__main__": main() diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 7608b41..0000000 --- a/setup.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[flake8] -max-line-length = 120 -ignore = F403,E265 -exclude = .git -max-complexity = 12 diff --git a/setup.py b/setup.py index 38a1fd7..21284d2 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setup( name='Collectfast', description='A Faster Collectstatic', - version='0.5.2', + version='0.6.0', long_description=open('README.rst').read(), author='Anton Agestam', author_email='msn@antonagestam.se', diff --git a/tox.ini b/tox.ini index ed36f62..5996489 100644 --- a/tox.ini +++ b/tox.ini @@ -17,4 +17,9 @@ passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH [testenv:flake8] basepython = python deps = flake8 -commands = flake8 --ignore=E722 collectfast +commands = flake8 collectfast runtests.py setup.py +[flake8] +max-line-length = 80 +ignore = F403,E265,E722 +exclude = .git +max-complexity = 8