From 398afa460a2883a774905d7f14f877407944db46 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Tue, 19 Jun 2018 15:11:58 -0700 Subject: pytest: add _pytest/_version.py and LICENSE - pytest was not reporing the correct version from pytest.__version__. It reported 'unknown' - this fixes issues on some systems where system-installed pytest plugins would try to use the version and convert it to an int --- lib/spack/external/_pytest/LICENSE | 21 +++++++++++++++++++++ lib/spack/external/_pytest/_version.py | 4 ++++ lib/spack/external/ordereddict_backport.py | 3 ++- lib/spack/external/pytest.py | 22 ++++++++++++++++++++++ 4 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 lib/spack/external/_pytest/LICENSE create mode 100644 lib/spack/external/_pytest/_version.py diff --git a/lib/spack/external/_pytest/LICENSE b/lib/spack/external/_pytest/LICENSE new file mode 100644 index 0000000000..629df45ac4 --- /dev/null +++ b/lib/spack/external/_pytest/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2004-2017 Holger Krekel and others + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/lib/spack/external/_pytest/_version.py b/lib/spack/external/_pytest/_version.py new file mode 100644 index 0000000000..3edb7da9ad --- /dev/null +++ b/lib/spack/external/_pytest/_version.py @@ -0,0 +1,4 @@ +# coding: utf-8 +# file generated by setuptools_scm +# don't change, don't track in version control +version = '3.2.5' diff --git a/lib/spack/external/ordereddict_backport.py b/lib/spack/external/ordereddict_backport.py index bd21103cdc..02b2ea1f4b 100644 --- a/lib/spack/external/ordereddict_backport.py +++ b/lib/spack/external/ordereddict_backport.py @@ -24,7 +24,8 @@ ############################################################################## """This file dispatches to the correct implementation of OrderedDict.""" -# TODO: this file can be removed when support for python 2.6 will be dropped +# TODO: this file, along with py26/ordereddict.py, can be removed when +# TODO: support for python 2.6 will be dropped # Removing this import will make python 2.6 # fail on import of ordereddict diff --git a/lib/spack/external/pytest.py b/lib/spack/external/pytest.py index 1c914a6edf..6e124db418 100644 --- a/lib/spack/external/pytest.py +++ b/lib/spack/external/pytest.py @@ -1,3 +1,25 @@ +# The MIT License (MIT) +# +# Copyright (c) 2004-2017 Holger Krekel and others +# +# Permission is hereby granted, free of charge, to any person obtaining a copy of +# this software and associated documentation files (the "Software"), to deal in +# the Software without restriction, including without limitation the rights to +# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +# of the Software, and to permit persons to whom the Software is furnished to do +# so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + # PYTHON_ARGCOMPLETE_OK """ pytest: unit and functional testing with Python. -- cgit v1.2.3-60-g2f50