diff options
| -rw-r--r-- | .travis.yml | 15 | ||||
| -rw-r--r-- | lib/spack/docs/packaging_guide.rst | 3 | ||||
| -rw-r--r-- | lib/spack/spack/modules/common.py | 2 |
3 files changed, 17 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 9d26ec83fd..1db49e476f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,12 @@ jobs: os: linux language: python env: TEST_SUITE=flake8 - - stage: 'unit tests + documentation' + - stage: 'flake8 + documentation' + python: '2.7' + os: linux + language: python + env: TEST_SUITE=doc + - stage: 'unit tests' python: '2.6' sudo: required os: linux @@ -127,6 +132,14 @@ stages: if: type = push AND branch IN (develop, master) +stages: + - 'flake8 + documentation' + - 'unit tests' + - 'build tests' + - name: 'unit tests - osx' + if: type IN (cron) + + #============================================================================= # Environment #============================================================================= diff --git a/lib/spack/docs/packaging_guide.rst b/lib/spack/docs/packaging_guide.rst index 647c38b6ec..17d7cffed4 100644 --- a/lib/spack/docs/packaging_guide.rst +++ b/lib/spack/docs/packaging_guide.rst @@ -2692,7 +2692,8 @@ as arguments. Here are the definitions of the three built-in flag handlers: -.. code-block:: python + def build_system_flags(self, name, flags): + return (None, None, flags) def inject_flags(pkg, name, flags): return (flags, None, None) diff --git a/lib/spack/spack/modules/common.py b/lib/spack/spack/modules/common.py index 87ad261121..482c3e1321 100644 --- a/lib/spack/spack/modules/common.py +++ b/lib/spack/spack/modules/common.py @@ -487,7 +487,7 @@ class BaseContext(tengine.Context): try: configure_args = getattr(pkg, attr)() return ' '.join(configure_args) - except (AttributeError, IOError, KeyError): + except (AttributeError, IOError, KeyError, NameError): # The method doesn't exist in the current spec, # or it's not usable pass |