diff options
| author | Harmen Stoppels <harmenstoppels@gmail.com> | 2021-10-03 15:09:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-03 09:09:02 -0400 |
| commit | b9e72557e8b52b63244500f226afda0efe798df2 (patch) | |
| tree | 80521b68338eccca9bd6787315938e51011946a2 /lib | |
| parent | 2de116d285f9853284b0e033d66a67bc0f3cdc2b (diff) | |
| download | spack-b9e72557e8b52b63244500f226afda0efe798df2.tar.gz spack-b9e72557e8b52b63244500f226afda0efe798df2.tar.bz2 spack-b9e72557e8b52b63244500f226afda0efe798df2.tar.xz spack-b9e72557e8b52b63244500f226afda0efe798df2.zip | |
Remove .99 from version ranges (#26422)
In most cases, .99 can be omitted thanks to #26402 .
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/docs/build_systems/pythonpackage.rst | 4 | ||||
| -rw-r--r-- | lib/spack/docs/packaging_guide.rst | 2 | ||||
| -rw-r--r-- | lib/spack/spack/build_systems/intel.py | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/spack/docs/build_systems/pythonpackage.rst b/lib/spack/docs/build_systems/pythonpackage.rst index 931c58724a..30875d15f3 100644 --- a/lib/spack/docs/build_systems/pythonpackage.rst +++ b/lib/spack/docs/build_systems/pythonpackage.rst @@ -336,7 +336,7 @@ This would be translated to: .. code-block:: python extends('python') - depends_on('python@3.5:3.999', type=('build', 'run')) + depends_on('python@3.5:3', type=('build', 'run')) Many ``setup.py`` or ``setup.cfg`` files also contain information like:: @@ -568,7 +568,7 @@ check the ``METADATA`` file for lines like:: Lines that use ``Requires-Dist`` are similar to ``install_requires``. Lines that use ``Provides-Extra`` are similar to ``extra_requires``, and you can add a variant for those dependencies. The ``~=1.11.0`` -syntax is equivalent to ``1.11.0:1.11.999``. +syntax is equivalent to ``1.11.0:1.11``. """""""""" setuptools diff --git a/lib/spack/docs/packaging_guide.rst b/lib/spack/docs/packaging_guide.rst index 3239438bcc..2f42336d15 100644 --- a/lib/spack/docs/packaging_guide.rst +++ b/lib/spack/docs/packaging_guide.rst @@ -2103,7 +2103,7 @@ correct way to specify this would be: .. code-block:: python - depends_on('python@2.6.0:2.6.999') + depends_on('python@2.6.0:2.6') A spec can contain multiple version ranges separated by commas. For example, if you need Boost 1.59.0 or newer, but there are known diff --git a/lib/spack/spack/build_systems/intel.py b/lib/spack/spack/build_systems/intel.py index 427cb75e49..2c6732c19a 100644 --- a/lib/spack/spack/build_systems/intel.py +++ b/lib/spack/spack/build_systems/intel.py @@ -116,9 +116,9 @@ class IntelPackage(PackageBase): # that satisfies self.spec will be used. version_years = { # intel-daal is versioned 2016 and later, no divining is needed - 'intel-ipp@9.0:9.99': 2016, - 'intel-mkl@11.3.0:11.3.999': 2016, - 'intel-mpi@5.1:5.99': 2016, + 'intel-ipp@9.0:9': 2016, + 'intel-mkl@11.3.0:11.3': 2016, + 'intel-mpi@5.1:5': 2016, } # Below is the list of possible values for setting auto dispatch functions |