Bug fix in composition_yaml.py
Don't throw error if variables are not CVC_CAL or CVC_DISP. Just don't put them in the dict, there are valid cases such as CVC_CONST. Change-Id: I3e8293d9957684a103938b215cb9359e0a519152
This commit is contained in:
Henrik Wahlqvist
parent
d45d16fb77
commit
52e12b8a3e
211
NOTICE
211
NOTICE
@ -12,7 +12,7 @@ Notices Report Content
|
||||
|
||||
Components:
|
||||
|
||||
Coverage 7.6.10: http://nedbatchelder.com/code/modules/coverage.html : Apache License 2.0
|
||||
Coverage 7.6.11: http://nedbatchelder.com/code/modules/coverage.html : Apache License 2.0
|
||||
exceptiongroup 1.2.2: https://github.com/python-trio/exceptiongroup : MIT License
|
||||
flake8 7.1.1: https://gitlab.com/pycqa/flake8 : MIT License
|
||||
gitdb 4.0.12: http://github.com/gitpython-developers/gitdb : BSD 3-clause "New" or "Revised" License
|
||||
@ -21,10 +21,11 @@ idna 3.10: https://github.com/kjd/idna : BSD 3-clause "New" or "Revised" License
|
||||
mccabe 0.7.0: http://pypi.python.org/pypi/mccabe : Expat License
|
||||
NumPy 1.24.4: https://numpy.org/ : BSD 3-clause "New" or "Revised" License
|
||||
Packaging 24.2: https://github.com/pypa/packaging : (BSD 2-clause "Simplified" License OR Apache License 2.0)
|
||||
pbr 6.1.0: http://openstack.org : Apache License 2.0
|
||||
pbr 6.1.1: http://openstack.org : Apache License 2.0
|
||||
psf-requests 2.32.3: http://docs.python-requests.org : Apache License 2.0
|
||||
pycodestyle 2.12.1: https://pypi.python.org/pypi/pycodestyle : MIT License
|
||||
Pyflakes 3.2.0: https://github.com/pyflakes/pyflakes : MIT License
|
||||
pypi/setuptools 59.6.0: https://pypi.org/project/setuptools/ : MIT License
|
||||
pytest 8.3.4: http://pytest.org : MIT License
|
||||
python3-charset-normalizer 3.4.1: https://github.com/ousret/charset_normalizer : MIT License
|
||||
python-certifi 2024.7.4: https://certifiio.readthedocs.io/en/latest/ : Mozilla Public License 2.0
|
||||
@ -40,65 +41,8 @@ voluptuous 0.15.2: http://pypi.python.org/pypi/voluptuous : BSD 3-clause "New" o
|
||||
|
||||
Copyright Text:
|
||||
|
||||
Coverage 7.6.10 pypi:coverage/7.6.10: http://nedbatchelder.com/code/modules/coverage.html
|
||||
(c)
|
||||
else:
|
||||
c.post_fork()
|
||||
self._collectors[:] = keep_collectors
|
||||
|
||||
if self._collectors:
|
||||
|
||||
(c)
|
||||
yield code
|
||||
|
||||
(c)
|
||||
else:
|
||||
c.post_fork()
|
||||
self._collectors[:] = keep_collectors
|
||||
|
||||
if self._collectors:
|
||||
|
||||
(c)
|
||||
yield code
|
||||
|
||||
(c) for c in re.split(r"(\d
|
||||
|
||||
def human_sorted(strings: Iterable[str]) -> list[str]:
|
||||
|
||||
(c) for c in re.split(r"(\d
|
||||
|
||||
def human_sorted(strings: Iterable[str]) -> list[str]:
|
||||
|
||||
(c) for c in self.code)
|
||||
|
||||
def add_line(self, line: str) -> None:
|
||||
|
||||
(c) for c in self.code)
|
||||
|
||||
def add_line(self, line: str) -> None:
|
||||
|
||||
(c) for c in text
|
||||
print(u"All OK with {encoding}")
|
||||
encoding = "{encoding}"
|
||||
""",
|
||||
|
||||
(c) for c in text
|
||||
source_text = source.format(encoding=encoding, text=text, ords=ords)
|
||||
zf.writestr(filename, source_text.encode(encoding))
|
||||
|
||||
with zipfile.ZipFile("tests/zip1.zip", "w") as zf:
|
||||
|
||||
(c)?c:a(c)):null
|
||||
Copyright 2001 Gareth Rees. All rights reserved.
|
||||
|
||||
Copyright 2004-
|
||||
)
|
||||
|
||||
Copyright 2004-2024 Ned Batchelder. All rights reserved.
|
||||
|
||||
Copyright 2004.
|
||||
Copyright Software Freedom Conservancy, Inc.
|
||||
|
||||
Coverage 7.6.11 pypi:coverage/7.6.11: http://nedbatchelder.com/code/modules/coverage.html
|
||||
No Copyrights found
|
||||
exceptiongroup 1.2.2 pypi:exceptiongroup/1.2.2: https://github.com/python-trio/exceptiongroup
|
||||
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
|
||||
|
||||
@ -2656,62 +2600,8 @@ modification, are permitted provided that the following conditions are met:
|
||||
# -- Options for HTML output --------------------------------------------------
|
||||
# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
|
||||
|
||||
pbr 6.1.0 pypi:pbr/6.1.0: http://openstack.org
|
||||
Copyright (c) 2011 OpenStack Foundation
|
||||
|
||||
Copyright (C) 2013 Association of Universities for Research in Astronomy
|
||||
# (AURA)
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions are met:
|
||||
#
|
||||
# 1. Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
#
|
||||
# 2. Redistributions in binary form must reproduce the above
|
||||
# copyright notice, this list of conditions and the following
|
||||
# disclaimer in the documentation and/or other materials provided
|
||||
# with the distribution.
|
||||
#
|
||||
|
||||
Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
|
||||
|
||||
Copyright (c) 2013 New Dream Network, LLC (DreamHost)
|
||||
|
||||
Copyright (c) 2013 Testrepository Contributors
|
||||
|
||||
Copyright (c) 2015 Hewlett-Packard Development Company, L.P. (HP)
|
||||
|
||||
Copyright (C) 2020 Red Hat, Inc.
|
||||
|
||||
Copyright 2010-2011 OpenStack Foundation
|
||||
|
||||
Copyright 2011 OpenStack Foundation
|
||||
|
||||
Copyright 2012 OpenStack Foundation
|
||||
|
||||
Copyright 2012 Red Hat, Inc.
|
||||
|
||||
Copyright 2012-2013 Hewlett-Packard Development Company, L.P.
|
||||
|
||||
Copyright 2013 Hewlett-Packard Development Company, L.P.
|
||||
|
||||
Copyright 2014 Hewlett-Packard Development Company, L.P.
|
||||
|
||||
Copyright 2018 Red Hat, Inc.
|
||||
|
||||
Copyright 2021 Monty Taylor
|
||||
|
||||
copyright = '2013, OpenStack Foundation
|
||||
|
||||
# If true, '()' will be appended to :func: etc. cross-reference text.
|
||||
add_function_parentheses = True
|
||||
|
||||
copyright = u
|
||||
|
||||
# If true, '()' will be appended to :func: etc. cross-reference text.
|
||||
add_function_parentheses = True
|
||||
|
||||
pbr 6.1.1 pypi:pbr/6.1.1: http://openstack.org
|
||||
No Copyrights found
|
||||
psf-requests 2.32.3 pypi:requests/2.32.3: http://docs.python-requests.org
|
||||
(c)
|
||||
return c
|
||||
@ -2749,6 +2639,66 @@ try:
|
||||
|
||||
Copyright 2013-2014 Florent Xicluna
|
||||
|
||||
pypi/setuptools 59.6.0 pypi:setuptools/59.6.0: https://pypi.org/project/setuptools/
|
||||
(c) *output
|
||||
}
|
||||
} while (1);
|
||||
|
||||
(c) > 255:
|
||||
has_high_char = True
|
||||
break
|
||||
if has_high_char:
|
||||
|
||||
(c) > 255:
|
||||
has_high_char = True
|
||||
break
|
||||
if has_high_char:
|
||||
|
||||
(c) for c in children
|
||||
[[1, 2, 3], [4, 5], [6, 7]]
|
||||
|
||||
If the length of the iterable is smaller than n, then the last returned
|
||||
iterables will be empty:
|
||||
|
||||
|
||||
(c) for c in children
|
||||
[[1, 4, 7], [2, 5], [3, 6]]
|
||||
|
||||
If the length of *iterable* is smaller than *n*, then the last returned
|
||||
iterables will be empty:
|
||||
|
||||
|
||||
(c) for c in children
|
||||
[[1], [2], [3], [], []]
|
||||
|
||||
This function uses :func:`itertools.tee` and may require significant
|
||||
storage. If you need the order items in the smaller iterables to match the
|
||||
original iterable, see :func:`divide`.
|
||||
|
||||
(c) for c in children
|
||||
[[1], [2], [3], [], []]
|
||||
|
||||
This function will exhaust the iterable before returning and may require
|
||||
significant storage. If order is not important, see :func:`distribute`,
|
||||
which does not first pull the iterable into memory.
|
||||
|
||||
(c) for c in range(ord(p
|
||||
try:
|
||||
|
||||
Copyright (c) 2003-2018 Paul T. McGuire
|
||||
|
||||
Copyright (C) 2005, 2006 Martin von L
|
||||
|
||||
Copyright (c) 2005-2010 ActiveState Software Inc.
|
||||
|
||||
Copyright (c) 2013 Eddy Petri
|
||||
|
||||
"""Utilities for determining application-specific dirs.
|
||||
|
||||
Copyright (c) Anderson Bravalheri
|
||||
|
||||
Copyright Jason R. Coombs
|
||||
|
||||
pytest 8.3.4 pypi:pytest/8.3.4: http://pytest.org
|
||||
(c)
|
||||
|
||||
@ -13685,7 +13635,7 @@ modification, are permitted provided that the following conditions are met:
|
||||
Licenses:
|
||||
|
||||
Apache License 2.0
|
||||
(Coverage 7.6.10, Packaging 24.2, pbr 6.1.0, psf-requests 2.32.3)
|
||||
(Coverage 7.6.11, Packaging 24.2, pbr 6.1.1, psf-requests 2.32.3)
|
||||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
@ -13963,6 +13913,31 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
---
|
||||
|
||||
MIT License
|
||||
(pypi/setuptools 59.6.0)
|
||||
|
||||
Copyright Jason R. Coombs
|
||||
|
||||
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
|
||||
|
||||
---
|
||||
|
||||
MIT License
|
||||
(exceptiongroup 1.2.2, flake8 7.1.1, pycodestyle 2.12.1, Pyflakes 3.2.0, pytest 8.3.4, python-pluggy 1.5.0, python3-charset-normalizer 3.4.1, RonnyPfannschmidt/iniconfig 2.0.0, ruamel-yaml 0.18.6, ruamel.yaml.clib 0.2.12, tomli 2.2.1, urllib3 2.3.0)
|
||||
|
||||
|
||||
@ -554,9 +554,6 @@ class CompositionYaml(ProblemLogger):
|
||||
calibration_variables[signal_name] = info
|
||||
elif "CVC_DISP" in info["class"]:
|
||||
measurable_variables[signal_name] = info
|
||||
else:
|
||||
self.critical("Signal %s has no class defined.", signal_name)
|
||||
continue
|
||||
return calibration_variables, measurable_variables
|
||||
|
||||
def _get_class_info(self, variable_dict):
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user