From 5b82bf47af78a95ff38d0abc4e24255962914639 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Thu, 2 May 2019 20:32:40 +0200 Subject: extend Version class so that 2.0 > 1.develop > 1.1 and develop > master > head > trunk > 9999 (#1983) * extend Version class so that 2.0 > 1.develop > 1.1 * add concretization tests, with preferences and preferred version. * add master, head, trunk as develop-like versions, develop > master > head > trunk * update documentation on version comparison --- .../builtin.mock/packages/develop-test2/package.py | 18 ++++++++++++++++++ .../builtin.mock/packages/preferred-test/package.py | 20 ++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin.mock/packages/develop-test2/package.py create mode 100644 var/spack/repos/builtin.mock/packages/preferred-test/package.py (limited to 'var') diff --git a/var/spack/repos/builtin.mock/packages/develop-test2/package.py b/var/spack/repos/builtin.mock/packages/develop-test2/package.py new file mode 100644 index 0000000000..762a82f838 --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/develop-test2/package.py @@ -0,0 +1,18 @@ +# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class DevelopTest2(Package): + """Dummy package with develop version""" + homepage = "http://www.openblas.net" + url = "http://github.com/xianyi/OpenBLAS/archive/v0.2.15.tar.gz" + + version('0.2.15.develop', git='https://github.com/dummy/repo.git') + version('0.2.15', 'b1190f3d3471685f17cfd1ec1d252ac9') + + def install(self, spec, prefix): + pass diff --git a/var/spack/repos/builtin.mock/packages/preferred-test/package.py b/var/spack/repos/builtin.mock/packages/preferred-test/package.py new file mode 100644 index 0000000000..29da42242d --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/preferred-test/package.py @@ -0,0 +1,20 @@ +# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class PreferredTest(Package): + """Dummy package with develop version and preffered version""" + homepage = "http://www.openblas.net" + url = "http://github.com/xianyi/OpenBLAS/archive/v0.2.15.tar.gz" + + version('develop', git='https://github.com/dummy/repo.git') + version('0.2.16', 'b1190f3d3471685f17cfd1ec1d252ac9') + version('0.2.15', 'b1190f3d3471685f17cfd1ec1d252ac9', preferred=True) + version('0.2.14', 'b1190f3d3471685f17cfd1ec1d252ac9') + + def install(self, spec, prefix): + pass -- cgit v1.2.3-60-g2f50