WIP: further refactors directories

sandialabs · Jul 19, 2016 · af3e482 · af3e482
1 parent 362766c
commit af3e482
Show file tree

Hide file tree

Showing 58 changed files with 16 additions and 22 deletions.
diff --git a/test/pylint_tools/.lint.conf → .lint.conf b/test/pylint_tools/.lint.conf → .lint.conf
diff --git a/test/automation_tools/__init__.py b/test/automation_tools/__init__.py
diff --git a/test/test_tools/__init__.py → test/helpers/__init__.py b/test/test_tools/__init__.py → test/helpers/__init__.py
diff --git a/test/helpers/automation_tools/__init__.py b/test/helpers/automation_tools/__init__.py
@@ -0,0 +1,2 @@
+from utilities   import get_branchname, run_pylint, directory
+from yamlwrapper import read_yaml, write_yaml
diff --git a/test/automation_tools/get_branch → test/helpers/automation_tools/get_branch b/test/automation_tools/get_branch → test/helpers/automation_tools/get_branch
diff --git a/test/automation_tools/utilities.py → test/helpers/automation_tools/utilities.py b/test/automation_tools/utilities.py → test/helpers/automation_tools/utilities.py
diff --git a/test/automation_tools/yamlwrapper.py → test/helpers/automation_tools/yamlwrapper.py b/test/automation_tools/yamlwrapper.py → test/helpers/automation_tools/yamlwrapper.py
diff --git a/test/pylint_tools/__init__.py → test/helpers/pylint/__init__.py b/test/pylint_tools/__init__.py → test/helpers/pylint/__init__.py
diff --git a/test/pylint_tools/findErrors.py → test/helpers/pylint/findErrors.py b/test/pylint_tools/findErrors.py → test/helpers/pylint/findErrors.py
diff --git a/test/pylint_tools/findWarnings.py → test/helpers/pylint/findWarnings.py b/test/pylint_tools/findWarnings.py → test/helpers/pylint/findWarnings.py
diff --git a/test/pylint_tools/helpers.py → test/helpers/pylint/helpers.py b/test/pylint_tools/helpers.py → test/helpers/pylint/helpers.py
diff --git a/test/pylint_tools/lintAll.py → test/helpers/pylint/lintAll.py b/test/pylint_tools/lintAll.py → test/helpers/pylint/lintAll.py
diff --git a/test/pylint_tools/lookFor.py → test/helpers/pylint/lookFor.py b/test/pylint_tools/lookFor.py → test/helpers/pylint/lookFor.py
@@ -1,24 +1,26 @@
 #!/usr/bin/env python3
-from helpers            import get_output, write_output
-from ..automation_tools import read_yaml
-import sys
+from helpers  import get_output, write_output
+from ..automation_tools import read_yaml, directory
+import os, sys
 
 # https://docs.pylint.org/features.html#general-options
 
 def look_for(items, filename):
     enabled   = ','.join(items)
     print('Generating %s in all of pygsti. This should take less than a minute' % enabled)
-
-    config    = read_yaml('config.yml')
+    config    = read_yaml('pylint_config.yml')
     commands  = [config['pylint-version'], 
                  '--disable=all',
                  '--enable=%s' % enabled,
                  '--rcfile=%s' % config['config-file'],
                  '--reports=n'] + config['packages']
 
-    output = get_output(commands)
+    # pyGSTi directory
+    with directory('..'):
+        output = get_output(commands)
     print('\n'.join(output))
-    write_output(output, 'output/%s.out' % filename)
+    with directory('output/pylint'):
+        write_output(output, '%s.out' % filename)
 
 if __name__ == "__main__":
     if len(sys.argv) == 1:

diff --git a/test/pylint_tools/output/cyclic-import.out → test/helpers/pylint/output/cyclic-import.out b/test/pylint_tools/output/cyclic-import.out → test/helpers/pylint/output/cyclic-import.out
diff --git a/test/pylint_tools/output/duplicate-code.out → .../helpers/pylint/output/duplicate-code.out b/test/pylint_tools/output/duplicate-code.out → .../helpers/pylint/output/duplicate-code.out
diff --git a/test/pylint_tools/output/errors.out → test/helpers/pylint/output/errors.out b/test/pylint_tools/output/errors.out → test/helpers/pylint/output/errors.out
diff --git a/test/pylint_tools/output/if.out → test/helpers/pylint/output/if.out b/test/pylint_tools/output/if.out → test/helpers/pylint/output/if.out
diff --git a/test/pylint_tools/output/missingdocs.out → test/helpers/pylint/output/missingdocs.out b/test/pylint_tools/output/missingdocs.out → test/helpers/pylint/output/missingdocs.out
diff --git a/test/pylint_tools/output/out.out → test/helpers/pylint/output/out.out b/test/pylint_tools/output/out.out → test/helpers/pylint/output/out.out
diff --git a/test/pylint_tools/output/rawexcept.out → test/helpers/pylint/output/rawexcept.out b/test/pylint_tools/output/rawexcept.out → test/helpers/pylint/output/rawexcept.out
diff --git a/test/pylint_tools/output/specific.out → test/helpers/pylint/output/specific.out b/test/pylint_tools/output/specific.out → test/helpers/pylint/output/specific.out
diff --git a/test/pylint_tools/output/todos.out → test/helpers/pylint/output/todos.out b/test/pylint_tools/output/todos.out → test/helpers/pylint/output/todos.out
diff --git a/...ylint_tools/output/too-many-arguments.txt → ...pers/pylint/output/too-many-arguments.txt b/...ylint_tools/output/too-many-arguments.txt → ...pers/pylint/output/too-many-arguments.txt
diff --git a/...s/output/too-many-boolean-expressions.txt → ...t/output/too-many-boolean-expressions.txt b/...s/output/too-many-boolean-expressions.txt → ...t/output/too-many-boolean-expressions.txt
diff --git a/...pylint_tools/output/too-many-branches.txt → ...lpers/pylint/output/too-many-branches.txt b/...pylint_tools/output/too-many-branches.txt → ...lpers/pylint/output/too-many-branches.txt
diff --git a/...s/output/too-many-instance-attributes.txt → ...t/output/too-many-instance-attributes.txt b/...s/output/too-many-instance-attributes.txt → ...t/output/too-many-instance-attributes.txt
diff --git a/test/pylint_tools/output/too-many-locals.txt → ...helpers/pylint/output/too-many-locals.txt b/test/pylint_tools/output/too-many-locals.txt → ...helpers/pylint/output/too-many-locals.txt
diff --git a/...ols/output/too-many-return-statements.txt → ...int/output/too-many-return-statements.txt b/...ols/output/too-many-return-statements.txt → ...int/output/too-many-return-statements.txt
diff --git a/...lint_tools/output/too-many-statements.txt → ...ers/pylint/output/too-many-statements.txt b/...lint_tools/output/too-many-statements.txt → ...ers/pylint/output/too-many-statements.txt
diff --git a/test/pylint_tools/output/unused-import.out → test/helpers/pylint/output/unused-import.out b/test/pylint_tools/output/unused-import.out → test/helpers/pylint/output/unused-import.out
diff --git a/test/pylint_tools/output/unused.out → test/helpers/pylint/output/unused.out b/test/pylint_tools/output/unused.out → test/helpers/pylint/output/unused.out
diff --git a/test/pylint_tools/output/warnings.out → test/helpers/pylint/output/warnings.out b/test/pylint_tools/output/warnings.out → test/helpers/pylint/output/warnings.out
diff --git a/test/pylint_tools/pylint_messages.txt → test/helpers/pylint/pylint_messages.txt b/test/pylint_tools/pylint_messages.txt → test/helpers/pylint/pylint_messages.txt
diff --git a/test/pylint_tools/runAdjustables.py → test/helpers/pylint/runAdjustables.py b/test/pylint_tools/runAdjustables.py → test/helpers/pylint/runAdjustables.py
diff --git a/test/pylint_tools/score.py → test/helpers/pylint/score.py b/test/pylint_tools/score.py → test/helpers/pylint/score.py
diff --git a/test/pylint_tools/yamlwrapper.py → test/helpers/pylint/yamlwrapper.py b/test/pylint_tools/yamlwrapper.py → test/helpers/pylint/yamlwrapper.py
diff --git a/test/helpers/test/__init__.py b/test/helpers/test/__init__.py
diff --git a/test/test_tools/_genInfo.py → test/helpers/test/_genInfo.py b/test/test_tools/_genInfo.py → test/helpers/test/_genInfo.py
diff --git a/test/test_tools/_getCoverage.py → test/helpers/test/_getCoverage.py b/test/test_tools/_getCoverage.py → test/helpers/test/_getCoverage.py
diff --git a/test/test_tools/_runBenchmark.py → test/helpers/test/_runBenchmark.py b/test/test_tools/_runBenchmark.py → test/helpers/test/_runBenchmark.py
diff --git a/test/test_tools/benchmarks/__init__.py → test/helpers/test/benchmarks/__init__.py b/test/test_tools/benchmarks/__init__.py → test/helpers/test/benchmarks/__init__.py
diff --git a/test/test_tools/benchmarks/benchmark.py → test/helpers/test/benchmarks/benchmark.py b/test/test_tools/benchmarks/benchmark.py → test/helpers/test/benchmarks/benchmark.py
diff --git a/test/test_tools/findDependencies.py → test/helpers/test/findDependencies.py b/test/test_tools/findDependencies.py → test/helpers/test/findDependencies.py
diff --git a/test/test_tools/genPackageInfo.py → test/helpers/test/genPackageInfo.py b/test/test_tools/genPackageInfo.py → test/helpers/test/genPackageInfo.py
diff --git a/test/test_tools/helpers.py → test/helpers/test/helpers.py b/test/test_tools/helpers.py → test/helpers/test/helpers.py
diff --git a/test/test_tools/runChanged.py → test/helpers/test/runChanged.py b/test/test_tools/runChanged.py → test/helpers/test/runChanged.py
diff --git a/test/test_tools/runCoverageTests.sh → test/helpers/test/runCoverageTests.sh b/test/test_tools/runCoverageTests.sh → test/helpers/test/runCoverageTests.sh
diff --git a/test/test_tools/runNoseTests.sh → test/helpers/test/runNoseTests.sh b/test/test_tools/runNoseTests.sh → test/helpers/test/runNoseTests.sh
diff --git a/test/test_tools/runNoseTests2.sh → test/helpers/test/runNoseTests2.sh b/test/test_tools/runNoseTests2.sh → test/helpers/test/runNoseTests2.sh
diff --git a/test/test_tools/runPackage.py → test/helpers/test/runPackage.py b/test/test_tools/runPackage.py → test/helpers/test/runPackage.py
diff --git a/test/test_tools/runTimedNoseTests.sh → test/helpers/test/runTimedNoseTests.sh b/test/test_tools/runTimedNoseTests.sh → test/helpers/test/runTimedNoseTests.sh
diff --git a/test/test_tools/testconfig.yml → test/helpers/test/testconfig.yml b/test/test_tools/testconfig.yml → test/helpers/test/testconfig.yml
diff --git a/test/lint.py b/test/lint.py
@@ -1,2 +1,3 @@
-from pylint_tools import look_for
-look_for(['unused-import'], 'unused_import')
+#!/usr/bin/env python
+from helpers.pylint import look_for
+look_for(['unused-argument'], 'unused-argument')
diff --git a/test/pylint_tools/config.yml → test/pylint_config.yml b/test/pylint_tools/config.yml → test/pylint_config.yml
@@ -32,8 +32,8 @@ desired-score: '9.10' # Pylint now checks the pylint scripts, which lowers the o
 
 # packages to be scores by pylint
 packages:
-- ../../packages/pygsti
-- ../../test
+- packages/pygsti
+- test
 
 pylint-version: pylint3
 

diff --git a/test/pylint_tools/genDuplicateCode.sh b/test/pylint_tools/genDuplicateCode.sh
diff --git a/test/pylint_tools/genMissingDocs.sh b/test/pylint_tools/genMissingDocs.sh
diff --git a/test/pylint_tools/genTODOS.sh b/test/pylint_tools/genTODOS.sh
diff --git a/test/pylint_tools/genUnused.sh b/test/pylint_tools/genUnused.sh