diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | lib/spack/docs/contribution_guide.rst | 2 | ||||
| -rw-r--r-- | lib/spack/docs/getting_started.rst | 8 |
3 files changed, 5 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 18dc499ecc..2c5889c324 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,10 +35,6 @@ jobs: os: linux language: python env: TEST_SUITE=unit - - python: '3.3' - os: linux - language: python - env: TEST_SUITE=unit - python: '3.4' os: linux language: python diff --git a/lib/spack/docs/contribution_guide.rst b/lib/spack/docs/contribution_guide.rst index 8123dbd164..542ba38519 100644 --- a/lib/spack/docs/contribution_guide.rst +++ b/lib/spack/docs/contribution_guide.rst @@ -56,7 +56,7 @@ locally to speed up the review process. If you take a look in ``$SPACK_ROOT/.travis.yml``, you'll notice that we test -against Python 2.6, 2.7, and 3.3-3.6 on both macOS and Linux. We currently +against Python 2.6, 2.7, and 3.4-3.7 on both macOS and Linux. We currently perform 3 types of tests: ^^^^^^^^^^ diff --git a/lib/spack/docs/getting_started.rst b/lib/spack/docs/getting_started.rst index 5c26c30d9f..1ea3c1a0e9 100644 --- a/lib/spack/docs/getting_started.rst +++ b/lib/spack/docs/getting_started.rst @@ -11,7 +11,7 @@ Prerequisites Spack has the following minimum requirements, which must be installed before Spack is run: -1. Python 2 (2.6 or 2.7) or 3 (3.3 - 3.6) +1. Python 2 (2.6 or 2.7) or 3 (3.4 - 3.7) 2. A C/C++ compiler 3. The ``git`` and ``curl`` commands. 4. If using the ``gpg`` subcommand, ``gnupg2`` is required. @@ -1218,13 +1218,13 @@ Here's an example of an external configuration for cray modules: This tells Spack that for whatever package that depends on mpi, load the cray-mpich module into the environment. You can then be able to use whatever environment variables, libraries, etc, that are brought into the environment -via module load. +via module load. .. note:: - For Cray-provided packages, it is best to use ``modules:`` instead of ``paths:`` + For Cray-provided packages, it is best to use ``modules:`` instead of ``paths:`` in ``packages.yaml``, because the Cray Programming Environment heavily relies on - modules (e.g., loading the ``cray-mpich`` module adds MPI libraries to the + modules (e.g., loading the ``cray-mpich`` module adds MPI libraries to the compiler wrapper link line). You can set the default compiler that Spack can use for each compiler type. |