Skip to content

Commit

Permalink
ignore flake8 W504 (#489)
Browse files Browse the repository at this point in the history
* ignore flake8 W504

* flake8 fixes

* more flake8 fixes

* remove a newline
  • Loading branch information
reaperhulk authored and alex committed Oct 29, 2018
1 parent a8c08b1 commit 8a384c3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 13 deletions.
6 changes: 2 additions & 4 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
#
# All configuration values have a default; values that are commented out
# serve to show the default.
import os
import sys

try:
import sphinx_rtd_theme
Expand All @@ -18,9 +16,9 @@
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
#sys.path.insert(0, os.path.abspath('.'))
# sys.path.insert(0, os.path.abspath('.'))

import nacl # flake8: noqa
import nacl # flake8: noqa

# -- General configuration ----------------------------------------------------

Expand Down
14 changes: 5 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,8 @@
import subprocess
import sys

from distutils.command.build import build

from setuptools import Distribution, setup

from setuptools.command.build_ext import build_ext as _build_ext
from setuptools.command.install import install

try:
from setuptools.command.build_clib import build_clib as _build_clib
Expand Down Expand Up @@ -70,7 +66,7 @@ def abshere(*paths):
sys.path.insert(0, abshere("src"))


import nacl # flake8: noqa
import nacl # noqa


def which(name, flags=os.X_OK): # Taken from twisted
Expand Down Expand Up @@ -190,11 +186,11 @@ def run(self):
self.include_dirs.append(
os.path.join(build_clib.build_clib, "include"),
)
self.library_dirs.insert(0,
os.path.join(build_clib.build_clib, "lib64"),
self.library_dirs.insert(
0, os.path.join(build_clib.build_clib, "lib64"),
)
self.library_dirs.insert(0,
os.path.join(build_clib.build_clib, "lib"),
self.library_dirs.insert(
0, os.path.join(build_clib.build_clib, "lib"),
)

return _build_ext.run(self)
Expand Down
1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ commands =
check-manifest . --ignore .travis.yml

[flake8]
ignore = W504
select = E,W,F,I
exclude = .tox,*.egg
application-import-names = nacl

0 comments on commit 8a384c3

Please sign in to comment.