diff --git a/.pep8 b/.pep8 deleted file mode 100644 index 5a67bb793e10696bc072aac9e7c63a7576a14cd4..0000000000000000000000000000000000000000 --- a/.pep8 +++ /dev/null @@ -1,3 +0,0 @@ -[pep8] -ignore = E123,E124,E126,E127,E128 -exclude = nacl.py diff --git a/.pylintrc b/.pylintrc deleted file mode 100644 index 19001fb0d074f8753521248feb88f33c46702dc3..0000000000000000000000000000000000000000 --- a/.pylintrc +++ /dev/null @@ -1,71 +0,0 @@ -[MASTER] -# Pickle collected data for later comparisons. -persistent=yes - - -[MESSAGES CONTROL] -# Disable the message, report, category or checker with the given id(s). You -# can either give multiple identifier separated by comma (,) or put this option -# multiple time (only on the command line, not in the configuration file where -# it should appear only once). -# W0511(fixme) - Do not need TODO's outputted typically -# I0011(locally-disabled) - If something is disabled it shouldn't generate more output -# C0111(missing-docstring) - Do not care if things are missing docstrings -# R0913(too-many-arguments) - Tool enforced limits like this are horrible -# R0903(too-few-public-methods) - Tool enforced limits like this are horrible -# R0904(too-many-public-methods) - Tool enforced limits like this are horrible -# R0911(too-many-return-statements) - Tool enforced limits like this are horrible -# R0912(too-many-branches) - Tool enforced limits like this are horrible -# R0914(too-many-locals) - Tool enforced limits like this are horrible -# R0201(no-self-use) - Does @staticmethod even really gain anything? -# W142(star-args) - Language features are not "magic" -# E0603(undefined-all-variable) - This appears to be broken? -disable=W0511,I0011,C0111,R0913,R0903,R0904,R0911,R0912,R0914,R0201,W0142,E0603 - - -[REPORTS] - -output-format=colorized - -include-ids=yes - -symbols=yes - -reports=no - -comment=no - - -[BASIC] -# List of builtins function names that should not be used, separated by a comma -bad-functions=map,filter,apply,input - -# Regular expression which should only match correct module level names -const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))|(ffi|lib)$ - -# Good variable names which should always be accepted, separated by a comma -good-names=i,j,k,_,fp - -# Bad variable names which should always be refused, separated by a comma -bad-names= - -[FORMAT] -# Maximum number of characters on a single line. -max-line-length=80 - - -[TYPECHECK] -# List of members which are set dynamically and missed by pylint inference -# system, and so shouldn't trigger E0201 when accessed. Python regular -# expressions are accepted. -generated-members=query,version,project - -# List of classes which members are set dynamically and missed by pylint -# inference system, and so shouldn't trigger E1101 when accessed. -ignored-classes=FFILibrary - - -[VARIABLES] -# A regular expression matching the beginning of the name of dummy variables -# (i.e. not used). -dummy-variables-rgx=_ diff --git a/.travis.yml b/.travis.yml index 29fa6fb7bedf2593b1d5504436608a128f7f79b4..e803cf0f428b5e53761bac0fbb203fe67c093530 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,33 +11,10 @@ install: - invoke install-nacl --library=$NACL - invoke install --dev script: - - invoke tests --suite=$SUITE + - invoke tests env: global: - LD_LIBRARY_PATH=/usr/local/lib - LD_RUN_PATH=/usr/local/lib matrix: - - NACL=libsodium SUITE=unit - - "NACL=libsodium SUITE=pep8,lint" -matrix: - exclude: - - python: "2.6" - env: - - "NACL=libsodium SUITE=pep8,lint" - - LD_LIBRARY_PATH=/usr/local/lib - - LD_RUN_PATH=/usr/local/lib - - python: "3.2" - env: - - "NACL=libsodium SUITE=pep8,lint" - - LD_LIBRARY_PATH=/usr/local/lib - - LD_RUN_PATH=/usr/local/lib - - python: "3.3" - env: - - "NACL=libsodium SUITE=pep8,lint" - - LD_LIBRARY_PATH=/usr/local/lib - - LD_RUN_PATH=/usr/local/lib - - python: "pypy" - env: - - "NACL=libsodium SUITE=pep8,lint" - - LD_LIBRARY_PATH=/usr/local/lib - - LD_RUN_PATH=/usr/local/lib + - NACL=libsodium diff --git a/tasks.py b/tasks.py index 704875081e3d38ec2239787502f6303a6a41284b..2baef0c2067168f01327b1fe76c32b2b89a5c3c8 100644 --- a/tasks.py +++ b/tasks.py @@ -66,17 +66,5 @@ def install(dev=False): @task -def tests(suite=None): - if suite is None: - suite = set(["pep8", "lint", "unit"]) - else: - suite = set(suite.split(",")) - - if "pep8" in suite: - run("pep8 nacl") - - if "lint" in suite: - run("pylint --rcfile .pylintrc -r y nacl") - - if "unit" in suite: - run("py.test") +def tests(): + run("py.test")