From 4b6ee1e2725327023fdd3badebab3a65eab821d0 Mon Sep 17 00:00:00 2001 From: domna Date: Wed, 17 May 2023 16:40:54 +0200 Subject: [PATCH 1/4] Use rust based formula dispersion --- .pylintrc | 3 +++ src/elli/dispersions/formula.py | 13 +++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.pylintrc b/.pylintrc index 6410487c..6731d31d 100644 --- a/.pylintrc +++ b/.pylintrc @@ -612,3 +612,6 @@ variable-naming-style=snake_case # naming-style. If left empty, variable names will be checked with the set # naming style. #variable-rgx= + +[MASTER] +extension-pkg-allow-list=formula_dispersion diff --git a/src/elli/dispersions/formula.py b/src/elli/dispersions/formula.py index 7d718b49..fdae9cfe 100644 --- a/src/elli/dispersions/formula.py +++ b/src/elli/dispersions/formula.py @@ -3,10 +3,10 @@ import numpy as np import numpy.typing as npt +from formula_dispersion import parse, get_representation from elli.units import ureg from elli.dispersions.base_dispersion import BaseDispersion, Dispersion, IndexDispersion -from elli.formula_parser.parser import parse_formula, FormulaTransformer class FormulaParser(BaseDispersion): @@ -95,7 +95,7 @@ def _set_unit_conversion(self, unit: str): raise ValueError(f"Unsupported unit `{unit}`.") def _check_repr(self): - representation = parse_formula(self.formula).data + representation = get_representation(self.formula) if isinstance(self, FormulaIndex) and not representation == "n": raise ValueError( @@ -108,12 +108,9 @@ def _check_repr(self): ) def __dispersion_function(self, lbda: npt.ArrayLike) -> npt.NDArray: - return FormulaTransformer( - x_axis_name=self.f_axis_name, - x_axis_values=lbda, - single_params=self.single_params, - repeated_params=self.rep_params_dl, - ).transform(parse_formula(self.formula))[1] + return parse( + self.formula, self.f_axis_name, lbda, self.single_params, self.rep_params_dl + ) class Formula(Dispersion, FormulaParser): From 8d82dacb7ce14a97295dbce755da2c0ed4f65e48 Mon Sep 17 00:00:00 2001 From: domna Date: Wed, 17 May 2023 17:49:42 +0200 Subject: [PATCH 2/4] Add dependencies for formula-dispersion --- MANIFEST.in | 3 +- pyproject.toml | 2 +- src/elli/formula_parser/__init__.py | 0 .../dispersion_function_grammar.lark | 51 ----- src/elli/formula_parser/parser.py | 183 ------------------ 5 files changed, 2 insertions(+), 237 deletions(-) delete mode 100644 src/elli/formula_parser/__init__.py delete mode 100644 src/elli/formula_parser/dispersion_function_grammar.lark delete mode 100644 src/elli/formula_parser/parser.py diff --git a/MANIFEST.in b/MANIFEST.in index ba2d1d90..6b5bcc73 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1 @@ -recursive-include src/elli/database/refractiveindexinfo-database *.yml -include src/elli/formula_parser/dispersion_function_grammer.lark \ No newline at end of file +recursive-include src/elli/database/refractiveindexinfo-database *.yml \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 85850b1b..3668f257 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,8 +29,8 @@ dependencies = [ "pyyaml", "importlib-resources", "rapidfuzz", - "lark>=1.1.5", "pint", + "formula-dispersion", ] [project.optional-dependencies] diff --git a/src/elli/formula_parser/__init__.py b/src/elli/formula_parser/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/src/elli/formula_parser/dispersion_function_grammar.lark b/src/elli/formula_parser/dispersion_function_grammar.lark deleted file mode 100644 index 7524723a..00000000 --- a/src/elli/formula_parser/dispersion_function_grammar.lark +++ /dev/null @@ -1,51 +0,0 @@ -?assignment: "eps" "=" kkr_expression -> eps - | "n" "=" kkr_expression -> n - -?kkr_expression: expression - | "" "+" "1j" "*" term -> kkr_term - -?expression: term - | expression "+" term -> add - | expression "-" term -> sub - -?term: factor - | term "*" factor -> mul - | term "/" factor -> div - -?factor: power - | power "**" power -> power - - -?power: "(" expression ")" - | FUNC "(" expression ")" -> func - | "sum" "[" repeated_expression "]" -> sum_expr - | NAME -> single_param_name - | SIGNED_NUMBER -> number - | BUILTIN -> builtin - -?repeated_expression: repeated_term - | repeated_expression "+" repeated_term -> add - | repeated_expression "-" repeated_term -> sub - - -?repeated_term: repeated_factor - | repeated_term "*" repeated_factor -> mul - | repeated_term "/" repeated_factor -> div - -?repeated_factor: repeated_power - | repeated_power "**" repeated_power -> power - -?repeated_power: "(" repeated_expression ")" - | FUNC "(" repeated_expression ")" -> func - | SIGNED_NUMBER -> number - | NAME -> param_name - | BUILTIN -> builtin - -FUNC.1: "sin" | "cos" | "tan" | "sqrt" | "dawsn" | "ln" | "log" | "heaviside" -BUILTIN.1: "1j" | "pi" | "eps_0" | "hbar" | "h" | "c" - -%import common.CNAME -> NAME -%import common.SIGNED_NUMBER -%import common.WS_INLINE - -%ignore WS_INLINE \ No newline at end of file diff --git a/src/elli/formula_parser/parser.py b/src/elli/formula_parser/parser.py deleted file mode 100644 index 1f265518..00000000 --- a/src/elli/formula_parser/parser.py +++ /dev/null @@ -1,183 +0,0 @@ -"""This modules creates a formula parser""" -from functools import lru_cache -import os -from operator import add, mul, neg, sub, truediv -from typing import Dict - -import numpy as np -import scipy.constants as sc -from lark import Lark, Transformer, v_args -from scipy.special import dawsn # pylint: disable=no-name-in-module - - -@v_args(inline=True) -class FormulaTransformer(Transformer): - """Transformer class for parsing formulas""" - - single_params: Dict[str, float] - repeated_params: Dict[str, np.ndarray] - no_repeated_params: int - - number = float - add = add - sub = sub - mul = mul - div = truediv - neg = neg - power = pow - - def _check_and_set(self, repeated_params): - if not repeated_params: - self.no_repeated_params = 0 - return - - if not isinstance(repeated_params, dict): - raise ValueError( - f"Repeated parameters must be a dict but found {type(repeated_params)}" - ) - - params = iter(repeated_params.items()) - length = len(next(params)[1]) - for name, param in params: - if not isinstance(param, np.ndarray): - raise TypeError( - f"Expected {name} to be of type numpy ndarray but found type {type(param)}" - ) - if length != len(param): - raise ValueError("Repeated parameters must have all the same length.") - - self.no_repeated_params = length - - def _check_and_set_single(self, single_params): - for name, param in single_params.items(): - if not isinstance(param, (float, int)): - raise TypeError( - f"Expected {name} to be of type float but found type {type(param)}." - ) - self.single_params = single_params - - def __init__( - self, - x_axis_name: str, - x_axis_values: np.ndarray, - single_params: Dict[str, float], - repeated_params: Dict[str, np.ndarray], - ): - super().__init__() - if not isinstance(x_axis_name, str): - raise TypeError("x_axis_name must be a string.") - - if not isinstance(x_axis_values, np.ndarray): - raise TypeError("x_axis_values must be a numpy array.") - - self.x_axis_name = x_axis_name - self.x_axis_values = x_axis_values - - self._check_and_set(repeated_params) - self._check_and_set_single(single_params) - - self.repeated_params = repeated_params - self.single_params = single_params - - def eps(self, inp): - """Return an epsilon type formula""" - return "eps", inp - - # pylint: disable=invalid-name - def n(self, inp): - """Return an index type formula""" - return "n", inp - - def kkr_term(self, term): - """Calculate the kramers kronig transformation on the function""" - raise NotImplementedError("kkr transformation not yet implemented") - - def func(self, name, val): - """Evaluates a function""" - names = { - "sin": np.sin, - "cos": np.cos, - "tan": np.tan, - "sqrt": np.emath.sqrt, - "dawsn": dawsn, - "ln": np.log, - "log": np.log10, - "heaviside": np.heaviside, - } - - if name in names: - return names[name](val) - - raise ValueError(f"Unknown function: {name}") - - def builtin(self, name): - """Returns the values for builtin tokens""" - names = { - "1j": 1j, - "pi": sc.pi, - "eps_0": sc.epsilon_0, - "hbar": sc.hbar, - "h": sc.h, - "c": sc.c, - } - - if name in names: - return names[name] - - raise ValueError(f"Unknown constant: {name}") - - def sum_expr(self, expr): - """Sum an expression""" - return expr.sum(axis=1) - - def single_param_name(self, name): - """Return a parameter inside a non-repeated section""" - if name == self.x_axis_name: - return self.x_axis_values - - if name in self.single_params: - return self.single_params[name] - - raise ValueError(f"No such parameter {name}") - - def param_name(self, name): - """Return a parameter inside a repeated section""" - if name == self.x_axis_name: - return np.einsum( - "i,j->ij", self.x_axis_values, np.ones(self.no_repeated_params) - ) - - if name in self.single_params: - return self.single_params[name] - - if name in self.repeated_params: - return self.repeated_params[name] - - raise ValueError(f"No such parameter {name}") - - -__location__ = os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))) - -with open( - f"{__location__}/dispersion_function_grammar.lark", encoding="utf-8" -) as formula_grammar: - grammar = Lark( - formula_grammar, - start="assignment", - parser="lalr", - ) - - -@lru_cache(maxsize=128) -def parse_formula(formula: str): - """ - Parses a dispersion formula string into an abstract syntax tree. - Uses caching to avoid re-parsing of the formula. - - Args: - formula (str): The formula string to parse. - - Returns: - Lark.Tree: The parsed formula Tree. - """ - return grammar.parse(formula) From 305f8f3af3c586b78caddb2a969fb769ef500ad9 Mon Sep 17 00:00:00 2001 From: domna Date: Thu, 18 May 2023 11:34:10 +0200 Subject: [PATCH 3/4] Update requirements --- requirements/dev-requirements.txt | 82 ++++++++++++++++++++++++--- requirements/fitting-requirements.txt | 82 ++++++++++++++++++++++++--- requirements/requirements.txt | 78 ++++++++++++++++++++++--- scripts/generate_requirements.sh | 6 +- 4 files changed, 220 insertions(+), 28 deletions(-) diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt index 7193b689..0215f4ea 100644 --- a/requirements/dev-requirements.txt +++ b/requirements/dev-requirements.txt @@ -1,8 +1,8 @@ # -# This file is autogenerated by pip-compile with python 3.9 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: # -# pip-compile --extra=fitting --extra=testing --generate-hashes --output-file=requirements/dev-requirements.txt pyproject.toml requirements/fitting-requirements.txt +# pip-compile --extra=fitting --extra=testing --generate-hashes --output-file=requirements/dev-requirements.txt --resolver=backtracking pyproject.toml requirements/fitting-requirements.txt # appnope==0.1.3 \ --hash=sha256:02bd91c4de869fbb1e1c50aafc4098827a7a54ab2f39d9dcba6c9547ed920e24 \ @@ -263,6 +263,76 @@ fonttools==4.37.1 \ # via # -r requirements/fitting-requirements.txt # matplotlib +formula-dispersion==0.1.1 \ + --hash=sha256:096e75d1904428d541f837cdf9c3ceb51f979cf79d85dcf289222935f9782e08 \ + --hash=sha256:112a346462847b215338452ec29bfac9080ae1f88eb20f821a317ba9a7e705b9 \ + --hash=sha256:192010f7e92ab8218559a7e018ffd518e5b85bfe87d77be3bf9193f70fae695b \ + --hash=sha256:20110b10f7fe63769542cdfe873790f125599c7ea09eed5427fb15c88d7c6085 \ + --hash=sha256:2177fc3225d60ceae9f2171b527384fdf53f723b120318c855221de1390c46ab \ + --hash=sha256:252fd46b673d87ed18ffe84be3613588677a1daae77fc63665678f048c5807c4 \ + --hash=sha256:25b5166a75aa369df581ae5a905bc1951ee84a571c30d32adc98bbdb576152c1 \ + --hash=sha256:314fd6add25d295bf2c01c9333b907d9882b6e345a7c9c7818ac3ee4470401ac \ + --hash=sha256:31a5cda79135485f62c91a25661d932f00d4b2ad7084fd73ce3e83aba423018c \ + --hash=sha256:3640396c0dc1bbec3f70da2edbf7f7eea776b01c1913897fc0c0c37fa4dad749 \ + --hash=sha256:372ecbd652c8e6d17fb20bff9f3ba492a8a7040586cee8fe7c5f742429b79fe8 \ + --hash=sha256:3874a177cc3f5b8511dcc78d136cd2ee4fb91903ca3af49439cd80a5cf2443b9 \ + --hash=sha256:39b5b34628863cb91f1bd027c07b967431837b0918ab69873afc481692f311b4 \ + --hash=sha256:4023c3571ce3dfa7f923e2cec6598c92de2e470fd702c5fd071438681f7a8b00 \ + --hash=sha256:40df8bb2d5665eeef1ab247a83c5990df5b43413b61076f20f68b6b46fe2dd03 \ + --hash=sha256:4215edbeb5ce366ff51c304265bee58e4ad69c53b7d367d37fee99ce8b13b1b4 \ + --hash=sha256:43c2de9d0e150fa22942fd0d752fa7252423b8a544e4e7cdd6c199a5070ccf54 \ + --hash=sha256:4f2de0f0696fafa5b6ead8d2005d99d81b3d301e4c774a5275257b95aca85da0 \ + --hash=sha256:578d79e03e4675ad9610e87b747c25d76d801265c3c6d3fc66ca411c925ce203 \ + --hash=sha256:5a94b69f936d694e44c7e7abbe8aa7dfa161a7c2ac2ef9c7d1372420837b5611 \ + --hash=sha256:68429570e86b498c6b1942975ccbf049ee53017c5a4edbc922c73dee57302181 \ + --hash=sha256:6df0b8cb60549b659cdb66a65dfde0ec98bae35c80944dbcefb5751e8f18d789 \ + --hash=sha256:7022e5592c4128a00d8bc3a1208194313fbd516428122a9c59b0933bc3394e70 \ + --hash=sha256:708cc699054993696d9c29d096fb41c50debcf2925dcab54f6c0904fa012f1d2 \ + --hash=sha256:753c14c5dcd1c72338fd80d2358f593b15c496cd3073df39eb09fb0e0ec1ae4c \ + --hash=sha256:77e1b523307eb9e929a27a400bb5a01ea868d8658693f09851a51ff477a9ca0b \ + --hash=sha256:7db61817c66de0b3586e83a886b75c54e1b8b08a62b00475d0945b418a417d34 \ + --hash=sha256:819438210314847ee51d35f8a6a23000e16d707c0159ccf4401edee43d1d5f09 \ + --hash=sha256:82f6dcb93cc2295c7e45cee1c8d6bca79f348aea90324a39b37eed7a04e3f3a8 \ + --hash=sha256:8716dd7d8e086dd3708012fdc6b8238cb6bf90bad1882f0cbff14ebefbeb8da6 \ + --hash=sha256:872f76f29005c4dc351957bc2666cc4740e2306f929599a08764a9c9424d298f \ + --hash=sha256:88609c76acd14015a6e7072509db512d239700171997132ef0fd30e0200a6acd \ + --hash=sha256:8e82b4185dc3fde7bbee3d5be28b0fe183d8aa50336178bb61d21ee606c70e32 \ + --hash=sha256:8edae27f9c6bb56523bf9507b7ff7b4274e49889da6078661e4e225038f89bbf \ + --hash=sha256:8ede82adda7fcc2c4f317879a81e16d9d0d47f8aa93d2389cfa74ee66fe8bcd0 \ + --hash=sha256:90e68346ea3c98c301c6cec6f7fd519c52825e3010aaa8f55cc56f9e27872ed3 \ + --hash=sha256:92e722955d2f2bd33147d3985756a3a5e2c828dff9612f34a84ecaacea5ee98e \ + --hash=sha256:992535411f33cf0ef1baed284997039b7236bbd383c189606cfe72cb05cdac38 \ + --hash=sha256:9b9594d82d5bbff8bc465423887daa6f6f8ee1818c2ce4fe3752e4d5d5df9e42 \ + --hash=sha256:a69d0511760d8b8131617b8be5fa067b2a94ceae6ccfe3c5f77e626fc5fd9cec \ + --hash=sha256:a745f85aa88fdf54531a0dc2144caa46188feaab94b90ff827ad01b3d1ca07ab \ + --hash=sha256:aae9e6b750f988b84b6149a70db1f4dedd1bb7585025df964b771617feb4d54b \ + --hash=sha256:abcee79ce6f6d05203c71bce22344b821db37a52a071706c21b03aa5a60bb292 \ + --hash=sha256:b127dc5aaf3bf0c671629e47aa72bd38aaab90984537ab9d8324437a9674fb81 \ + --hash=sha256:b37f430fbb14ba5fe7b8deacbb5cd8148a488bb5e98c58a4117d696a8b048d0b \ + --hash=sha256:bbd5220d878492f74fe8185ffe86bf006c4662f7c7057ea03f75e43f8565e483 \ + --hash=sha256:c3c7bee36877695b1fe5ec87c6940bd4124fea3de5caad592f5ba423b058c628 \ + --hash=sha256:c57fb8bd4f9e675170dc75ebcc33cd4243e13bd6498ce496dd50398452cf9439 \ + --hash=sha256:c6e4097a9eff4211e6b15eb613201461d56e1c74f6179eb55b1b89efa1b55821 \ + --hash=sha256:c7a9fb9ee7e92b5ecff66ba95096e393da78da2d522793fcc6b69d912a92a22d \ + --hash=sha256:cca2827afb41bd517a373c48e7cd35a454dd12773d2439b17e421328d5f4aebe \ + --hash=sha256:d0f1f35a9bb44a8257ed8b7639f98abf9586767c9366cc806670e5c9fdb6633a \ + --hash=sha256:d726b0f880f812d35d82803675c2282d5a045b9f05b09a1e3c55394d88082b4d \ + --hash=sha256:d948420a80f67f314c3bb8ec9e477fa3062ae1f9b5051b8bb6f8361e4d085fc1 \ + --hash=sha256:dbfe39c96d4aa45aaf1fa39501dc8000935b8ccac6b7fbdf324a4e9b5f6dd259 \ + --hash=sha256:e4534c40729070f77b55c108a58d86f97e6ea4f2e75de3912114e2884faaf0a6 \ + --hash=sha256:e4c51a898db124cd8b7000bd8bc2af3000ce72b2fb61931df7366fa8690cb830 \ + --hash=sha256:e4de1d94a2d8eda97f23f991eb83682e4d083cf7d72db85f0514d0d098fcc08a \ + --hash=sha256:e50aad7522771c8700b8a1563fbc8f439c7fbff96ea5ec9bf7f99fabf596dc76 \ + --hash=sha256:f625f43c7ad9a271b99444ce6cee119f65d40e9352773860a3f16ef69bc3cc59 \ + --hash=sha256:f73bbbf15abd15c9df1fdccd3a631c43e510a515f79bb8d370c010759b5f19c3 \ + --hash=sha256:f7cb9a578de6919291e2ad86660c621c3f111d1e2b4b6f8b75127430ad3c9cb5 \ + --hash=sha256:fc07083dcf0a399a0576f5e776cefba0637ef3e08c1ec75d309945bcbe0d15ba \ + --hash=sha256:fe443f0378a20a8c8bf2dee8e96b0f32450e1977808379082a35c0a468e3bf7c \ + --hash=sha256:ff38bd528ac9a8af7d89ba7ae923e1289465eda76ab5be96a1258baf8118c897 \ + --hash=sha256:ff511575e957df3aea58eb1f36e1d7b1fa8fd65552fb0032e52c9a2dc754e670 + # via + # -r requirements/fitting-requirements.txt + # pyElli (pyproject.toml) future==0.18.3 \ --hash=sha256:34a17436ed1e96697a86f9de3d15a3b0be01d8bc8de9c1dffd59fb8234ed5307 # via @@ -457,12 +527,6 @@ kiwisolver==1.4.4 \ # via # -r requirements/fitting-requirements.txt # matplotlib -lark==1.1.5 \ - --hash=sha256:4b534eae1f9af5b4ea000bea95776350befe1981658eea3820a01c37e504bb4d \ - --hash=sha256:8476f9903e93fbde4f6c327f74d79e9b4bd0ed9294c5dfa3164ab8c581b5de2a - # via - # -r requirements/fitting-requirements.txt - # pyElli (pyproject.toml) lmfit==1.0.3 \ --hash=sha256:d067c3ea501f035af5d3c079e6e6e35dc3cc1ac7d439429a425b0aeb5a7858a2 # via diff --git a/requirements/fitting-requirements.txt b/requirements/fitting-requirements.txt index fed27aa7..608feadc 100644 --- a/requirements/fitting-requirements.txt +++ b/requirements/fitting-requirements.txt @@ -1,8 +1,8 @@ # -# This file is autogenerated by pip-compile with python 3.9 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: # -# pip-compile --extra=fitting --generate-hashes --output-file=requirements/fitting-requirements.txt pyproject.toml requirements/requirements.txt +# pip-compile --extra=fitting --generate-hashes --output-file=requirements/fitting-requirements.txt --resolver=backtracking pyproject.toml requirements/requirements.txt # appnope==0.1.3 \ --hash=sha256:02bd91c4de869fbb1e1c50aafc4098827a7a54ab2f39d9dcba6c9547ed920e24 \ @@ -175,6 +175,76 @@ fonttools==4.37.1 \ --hash=sha256:4606e1a88ee1f6699d182fea9511bd9a8a915d913eab4584e5226da1180fcce7 \ --hash=sha256:fff6b752e326c15756c819fe2fe7ceab69f96a1dbcfe8911d0941cdb49905007 # via matplotlib +formula-dispersion==0.1.1 \ + --hash=sha256:096e75d1904428d541f837cdf9c3ceb51f979cf79d85dcf289222935f9782e08 \ + --hash=sha256:112a346462847b215338452ec29bfac9080ae1f88eb20f821a317ba9a7e705b9 \ + --hash=sha256:192010f7e92ab8218559a7e018ffd518e5b85bfe87d77be3bf9193f70fae695b \ + --hash=sha256:20110b10f7fe63769542cdfe873790f125599c7ea09eed5427fb15c88d7c6085 \ + --hash=sha256:2177fc3225d60ceae9f2171b527384fdf53f723b120318c855221de1390c46ab \ + --hash=sha256:252fd46b673d87ed18ffe84be3613588677a1daae77fc63665678f048c5807c4 \ + --hash=sha256:25b5166a75aa369df581ae5a905bc1951ee84a571c30d32adc98bbdb576152c1 \ + --hash=sha256:314fd6add25d295bf2c01c9333b907d9882b6e345a7c9c7818ac3ee4470401ac \ + --hash=sha256:31a5cda79135485f62c91a25661d932f00d4b2ad7084fd73ce3e83aba423018c \ + --hash=sha256:3640396c0dc1bbec3f70da2edbf7f7eea776b01c1913897fc0c0c37fa4dad749 \ + --hash=sha256:372ecbd652c8e6d17fb20bff9f3ba492a8a7040586cee8fe7c5f742429b79fe8 \ + --hash=sha256:3874a177cc3f5b8511dcc78d136cd2ee4fb91903ca3af49439cd80a5cf2443b9 \ + --hash=sha256:39b5b34628863cb91f1bd027c07b967431837b0918ab69873afc481692f311b4 \ + --hash=sha256:4023c3571ce3dfa7f923e2cec6598c92de2e470fd702c5fd071438681f7a8b00 \ + --hash=sha256:40df8bb2d5665eeef1ab247a83c5990df5b43413b61076f20f68b6b46fe2dd03 \ + --hash=sha256:4215edbeb5ce366ff51c304265bee58e4ad69c53b7d367d37fee99ce8b13b1b4 \ + --hash=sha256:43c2de9d0e150fa22942fd0d752fa7252423b8a544e4e7cdd6c199a5070ccf54 \ + --hash=sha256:4f2de0f0696fafa5b6ead8d2005d99d81b3d301e4c774a5275257b95aca85da0 \ + --hash=sha256:578d79e03e4675ad9610e87b747c25d76d801265c3c6d3fc66ca411c925ce203 \ + --hash=sha256:5a94b69f936d694e44c7e7abbe8aa7dfa161a7c2ac2ef9c7d1372420837b5611 \ + --hash=sha256:68429570e86b498c6b1942975ccbf049ee53017c5a4edbc922c73dee57302181 \ + --hash=sha256:6df0b8cb60549b659cdb66a65dfde0ec98bae35c80944dbcefb5751e8f18d789 \ + --hash=sha256:7022e5592c4128a00d8bc3a1208194313fbd516428122a9c59b0933bc3394e70 \ + --hash=sha256:708cc699054993696d9c29d096fb41c50debcf2925dcab54f6c0904fa012f1d2 \ + --hash=sha256:753c14c5dcd1c72338fd80d2358f593b15c496cd3073df39eb09fb0e0ec1ae4c \ + --hash=sha256:77e1b523307eb9e929a27a400bb5a01ea868d8658693f09851a51ff477a9ca0b \ + --hash=sha256:7db61817c66de0b3586e83a886b75c54e1b8b08a62b00475d0945b418a417d34 \ + --hash=sha256:819438210314847ee51d35f8a6a23000e16d707c0159ccf4401edee43d1d5f09 \ + --hash=sha256:82f6dcb93cc2295c7e45cee1c8d6bca79f348aea90324a39b37eed7a04e3f3a8 \ + --hash=sha256:8716dd7d8e086dd3708012fdc6b8238cb6bf90bad1882f0cbff14ebefbeb8da6 \ + --hash=sha256:872f76f29005c4dc351957bc2666cc4740e2306f929599a08764a9c9424d298f \ + --hash=sha256:88609c76acd14015a6e7072509db512d239700171997132ef0fd30e0200a6acd \ + --hash=sha256:8e82b4185dc3fde7bbee3d5be28b0fe183d8aa50336178bb61d21ee606c70e32 \ + --hash=sha256:8edae27f9c6bb56523bf9507b7ff7b4274e49889da6078661e4e225038f89bbf \ + --hash=sha256:8ede82adda7fcc2c4f317879a81e16d9d0d47f8aa93d2389cfa74ee66fe8bcd0 \ + --hash=sha256:90e68346ea3c98c301c6cec6f7fd519c52825e3010aaa8f55cc56f9e27872ed3 \ + --hash=sha256:92e722955d2f2bd33147d3985756a3a5e2c828dff9612f34a84ecaacea5ee98e \ + --hash=sha256:992535411f33cf0ef1baed284997039b7236bbd383c189606cfe72cb05cdac38 \ + --hash=sha256:9b9594d82d5bbff8bc465423887daa6f6f8ee1818c2ce4fe3752e4d5d5df9e42 \ + --hash=sha256:a69d0511760d8b8131617b8be5fa067b2a94ceae6ccfe3c5f77e626fc5fd9cec \ + --hash=sha256:a745f85aa88fdf54531a0dc2144caa46188feaab94b90ff827ad01b3d1ca07ab \ + --hash=sha256:aae9e6b750f988b84b6149a70db1f4dedd1bb7585025df964b771617feb4d54b \ + --hash=sha256:abcee79ce6f6d05203c71bce22344b821db37a52a071706c21b03aa5a60bb292 \ + --hash=sha256:b127dc5aaf3bf0c671629e47aa72bd38aaab90984537ab9d8324437a9674fb81 \ + --hash=sha256:b37f430fbb14ba5fe7b8deacbb5cd8148a488bb5e98c58a4117d696a8b048d0b \ + --hash=sha256:bbd5220d878492f74fe8185ffe86bf006c4662f7c7057ea03f75e43f8565e483 \ + --hash=sha256:c3c7bee36877695b1fe5ec87c6940bd4124fea3de5caad592f5ba423b058c628 \ + --hash=sha256:c57fb8bd4f9e675170dc75ebcc33cd4243e13bd6498ce496dd50398452cf9439 \ + --hash=sha256:c6e4097a9eff4211e6b15eb613201461d56e1c74f6179eb55b1b89efa1b55821 \ + --hash=sha256:c7a9fb9ee7e92b5ecff66ba95096e393da78da2d522793fcc6b69d912a92a22d \ + --hash=sha256:cca2827afb41bd517a373c48e7cd35a454dd12773d2439b17e421328d5f4aebe \ + --hash=sha256:d0f1f35a9bb44a8257ed8b7639f98abf9586767c9366cc806670e5c9fdb6633a \ + --hash=sha256:d726b0f880f812d35d82803675c2282d5a045b9f05b09a1e3c55394d88082b4d \ + --hash=sha256:d948420a80f67f314c3bb8ec9e477fa3062ae1f9b5051b8bb6f8361e4d085fc1 \ + --hash=sha256:dbfe39c96d4aa45aaf1fa39501dc8000935b8ccac6b7fbdf324a4e9b5f6dd259 \ + --hash=sha256:e4534c40729070f77b55c108a58d86f97e6ea4f2e75de3912114e2884faaf0a6 \ + --hash=sha256:e4c51a898db124cd8b7000bd8bc2af3000ce72b2fb61931df7366fa8690cb830 \ + --hash=sha256:e4de1d94a2d8eda97f23f991eb83682e4d083cf7d72db85f0514d0d098fcc08a \ + --hash=sha256:e50aad7522771c8700b8a1563fbc8f439c7fbff96ea5ec9bf7f99fabf596dc76 \ + --hash=sha256:f625f43c7ad9a271b99444ce6cee119f65d40e9352773860a3f16ef69bc3cc59 \ + --hash=sha256:f73bbbf15abd15c9df1fdccd3a631c43e510a515f79bb8d370c010759b5f19c3 \ + --hash=sha256:f7cb9a578de6919291e2ad86660c621c3f111d1e2b4b6f8b75127430ad3c9cb5 \ + --hash=sha256:fc07083dcf0a399a0576f5e776cefba0637ef3e08c1ec75d309945bcbe0d15ba \ + --hash=sha256:fe443f0378a20a8c8bf2dee8e96b0f32450e1977808379082a35c0a468e3bf7c \ + --hash=sha256:ff38bd528ac9a8af7d89ba7ae923e1289465eda76ab5be96a1258baf8118c897 \ + --hash=sha256:ff511575e957df3aea58eb1f36e1d7b1fa8fd65552fb0032e52c9a2dc754e670 + # via + # -r requirements/requirements.txt + # pyElli (pyproject.toml) future==0.18.3 \ --hash=sha256:34a17436ed1e96697a86f9de3d15a3b0be01d8bc8de9c1dffd59fb8234ed5307 # via uncertainties @@ -342,12 +412,6 @@ kiwisolver==1.4.4 \ --hash=sha256:f8ad8285b01b0d4695102546b342b493b3ccc6781fc28c8c6a1bb63e95d22f09 \ --hash=sha256:f9f39e2f049db33a908319cf46624a569b36983c7c78318e9726a4cb8923b26c # via matplotlib -lark==1.1.5 \ - --hash=sha256:4b534eae1f9af5b4ea000bea95776350befe1981658eea3820a01c37e504bb4d \ - --hash=sha256:8476f9903e93fbde4f6c327f74d79e9b4bd0ed9294c5dfa3164ab8c581b5de2a - # via - # -r requirements/requirements.txt - # pyElli (pyproject.toml) lmfit==1.0.3 \ --hash=sha256:d067c3ea501f035af5d3c079e6e6e35dc3cc1ac7d439429a425b0aeb5a7858a2 # via pyElli (pyproject.toml) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 42d363c4..c6d9b407 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,9 +1,77 @@ # -# This file is autogenerated by pip-compile with python 3.9 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: # -# pip-compile --generate-hashes --output-file=requirements/requirements.txt pyproject.toml +# pip-compile --generate-hashes --output-file=requirements/requirements.txt --resolver=backtracking pyproject.toml # +formula-dispersion==0.1.1 \ + --hash=sha256:096e75d1904428d541f837cdf9c3ceb51f979cf79d85dcf289222935f9782e08 \ + --hash=sha256:112a346462847b215338452ec29bfac9080ae1f88eb20f821a317ba9a7e705b9 \ + --hash=sha256:192010f7e92ab8218559a7e018ffd518e5b85bfe87d77be3bf9193f70fae695b \ + --hash=sha256:20110b10f7fe63769542cdfe873790f125599c7ea09eed5427fb15c88d7c6085 \ + --hash=sha256:2177fc3225d60ceae9f2171b527384fdf53f723b120318c855221de1390c46ab \ + --hash=sha256:252fd46b673d87ed18ffe84be3613588677a1daae77fc63665678f048c5807c4 \ + --hash=sha256:25b5166a75aa369df581ae5a905bc1951ee84a571c30d32adc98bbdb576152c1 \ + --hash=sha256:314fd6add25d295bf2c01c9333b907d9882b6e345a7c9c7818ac3ee4470401ac \ + --hash=sha256:31a5cda79135485f62c91a25661d932f00d4b2ad7084fd73ce3e83aba423018c \ + --hash=sha256:3640396c0dc1bbec3f70da2edbf7f7eea776b01c1913897fc0c0c37fa4dad749 \ + --hash=sha256:372ecbd652c8e6d17fb20bff9f3ba492a8a7040586cee8fe7c5f742429b79fe8 \ + --hash=sha256:3874a177cc3f5b8511dcc78d136cd2ee4fb91903ca3af49439cd80a5cf2443b9 \ + --hash=sha256:39b5b34628863cb91f1bd027c07b967431837b0918ab69873afc481692f311b4 \ + --hash=sha256:4023c3571ce3dfa7f923e2cec6598c92de2e470fd702c5fd071438681f7a8b00 \ + --hash=sha256:40df8bb2d5665eeef1ab247a83c5990df5b43413b61076f20f68b6b46fe2dd03 \ + --hash=sha256:4215edbeb5ce366ff51c304265bee58e4ad69c53b7d367d37fee99ce8b13b1b4 \ + --hash=sha256:43c2de9d0e150fa22942fd0d752fa7252423b8a544e4e7cdd6c199a5070ccf54 \ + --hash=sha256:4f2de0f0696fafa5b6ead8d2005d99d81b3d301e4c774a5275257b95aca85da0 \ + --hash=sha256:578d79e03e4675ad9610e87b747c25d76d801265c3c6d3fc66ca411c925ce203 \ + --hash=sha256:5a94b69f936d694e44c7e7abbe8aa7dfa161a7c2ac2ef9c7d1372420837b5611 \ + --hash=sha256:68429570e86b498c6b1942975ccbf049ee53017c5a4edbc922c73dee57302181 \ + --hash=sha256:6df0b8cb60549b659cdb66a65dfde0ec98bae35c80944dbcefb5751e8f18d789 \ + --hash=sha256:7022e5592c4128a00d8bc3a1208194313fbd516428122a9c59b0933bc3394e70 \ + --hash=sha256:708cc699054993696d9c29d096fb41c50debcf2925dcab54f6c0904fa012f1d2 \ + --hash=sha256:753c14c5dcd1c72338fd80d2358f593b15c496cd3073df39eb09fb0e0ec1ae4c \ + --hash=sha256:77e1b523307eb9e929a27a400bb5a01ea868d8658693f09851a51ff477a9ca0b \ + --hash=sha256:7db61817c66de0b3586e83a886b75c54e1b8b08a62b00475d0945b418a417d34 \ + --hash=sha256:819438210314847ee51d35f8a6a23000e16d707c0159ccf4401edee43d1d5f09 \ + --hash=sha256:82f6dcb93cc2295c7e45cee1c8d6bca79f348aea90324a39b37eed7a04e3f3a8 \ + --hash=sha256:8716dd7d8e086dd3708012fdc6b8238cb6bf90bad1882f0cbff14ebefbeb8da6 \ + --hash=sha256:872f76f29005c4dc351957bc2666cc4740e2306f929599a08764a9c9424d298f \ + --hash=sha256:88609c76acd14015a6e7072509db512d239700171997132ef0fd30e0200a6acd \ + --hash=sha256:8e82b4185dc3fde7bbee3d5be28b0fe183d8aa50336178bb61d21ee606c70e32 \ + --hash=sha256:8edae27f9c6bb56523bf9507b7ff7b4274e49889da6078661e4e225038f89bbf \ + --hash=sha256:8ede82adda7fcc2c4f317879a81e16d9d0d47f8aa93d2389cfa74ee66fe8bcd0 \ + --hash=sha256:90e68346ea3c98c301c6cec6f7fd519c52825e3010aaa8f55cc56f9e27872ed3 \ + --hash=sha256:92e722955d2f2bd33147d3985756a3a5e2c828dff9612f34a84ecaacea5ee98e \ + --hash=sha256:992535411f33cf0ef1baed284997039b7236bbd383c189606cfe72cb05cdac38 \ + --hash=sha256:9b9594d82d5bbff8bc465423887daa6f6f8ee1818c2ce4fe3752e4d5d5df9e42 \ + --hash=sha256:a69d0511760d8b8131617b8be5fa067b2a94ceae6ccfe3c5f77e626fc5fd9cec \ + --hash=sha256:a745f85aa88fdf54531a0dc2144caa46188feaab94b90ff827ad01b3d1ca07ab \ + --hash=sha256:aae9e6b750f988b84b6149a70db1f4dedd1bb7585025df964b771617feb4d54b \ + --hash=sha256:abcee79ce6f6d05203c71bce22344b821db37a52a071706c21b03aa5a60bb292 \ + --hash=sha256:b127dc5aaf3bf0c671629e47aa72bd38aaab90984537ab9d8324437a9674fb81 \ + --hash=sha256:b37f430fbb14ba5fe7b8deacbb5cd8148a488bb5e98c58a4117d696a8b048d0b \ + --hash=sha256:bbd5220d878492f74fe8185ffe86bf006c4662f7c7057ea03f75e43f8565e483 \ + --hash=sha256:c3c7bee36877695b1fe5ec87c6940bd4124fea3de5caad592f5ba423b058c628 \ + --hash=sha256:c57fb8bd4f9e675170dc75ebcc33cd4243e13bd6498ce496dd50398452cf9439 \ + --hash=sha256:c6e4097a9eff4211e6b15eb613201461d56e1c74f6179eb55b1b89efa1b55821 \ + --hash=sha256:c7a9fb9ee7e92b5ecff66ba95096e393da78da2d522793fcc6b69d912a92a22d \ + --hash=sha256:cca2827afb41bd517a373c48e7cd35a454dd12773d2439b17e421328d5f4aebe \ + --hash=sha256:d0f1f35a9bb44a8257ed8b7639f98abf9586767c9366cc806670e5c9fdb6633a \ + --hash=sha256:d726b0f880f812d35d82803675c2282d5a045b9f05b09a1e3c55394d88082b4d \ + --hash=sha256:d948420a80f67f314c3bb8ec9e477fa3062ae1f9b5051b8bb6f8361e4d085fc1 \ + --hash=sha256:dbfe39c96d4aa45aaf1fa39501dc8000935b8ccac6b7fbdf324a4e9b5f6dd259 \ + --hash=sha256:e4534c40729070f77b55c108a58d86f97e6ea4f2e75de3912114e2884faaf0a6 \ + --hash=sha256:e4c51a898db124cd8b7000bd8bc2af3000ce72b2fb61931df7366fa8690cb830 \ + --hash=sha256:e4de1d94a2d8eda97f23f991eb83682e4d083cf7d72db85f0514d0d098fcc08a \ + --hash=sha256:e50aad7522771c8700b8a1563fbc8f439c7fbff96ea5ec9bf7f99fabf596dc76 \ + --hash=sha256:f625f43c7ad9a271b99444ce6cee119f65d40e9352773860a3f16ef69bc3cc59 \ + --hash=sha256:f73bbbf15abd15c9df1fdccd3a631c43e510a515f79bb8d370c010759b5f19c3 \ + --hash=sha256:f7cb9a578de6919291e2ad86660c621c3f111d1e2b4b6f8b75127430ad3c9cb5 \ + --hash=sha256:fc07083dcf0a399a0576f5e776cefba0637ef3e08c1ec75d309945bcbe0d15ba \ + --hash=sha256:fe443f0378a20a8c8bf2dee8e96b0f32450e1977808379082a35c0a468e3bf7c \ + --hash=sha256:ff38bd528ac9a8af7d89ba7ae923e1289465eda76ab5be96a1258baf8118c897 \ + --hash=sha256:ff511575e957df3aea58eb1f36e1d7b1fa8fd65552fb0032e52c9a2dc754e670 + # via pyElli (pyproject.toml) h5py==3.7.0 \ --hash=sha256:03d64fb86bb86b978928bad923b64419a23e836499ec6363e305ad28afd9d287 \ --hash=sha256:04e2e1e2fc51b8873e972a08d2f89625ef999b1f2d276199011af57bb9fc7851 \ @@ -30,10 +98,6 @@ importlib-resources==5.10.0 \ --hash=sha256:c01b1b94210d9849f286b86bb51bcea7cd56dde0600d8db721d7b81330711668 \ --hash=sha256:ee17ec648f85480d523596ce49eae8ead87d5631ae1551f913c0100b5edd3437 # via pyElli (pyproject.toml) -lark==1.1.5 \ - --hash=sha256:4b534eae1f9af5b4ea000bea95776350befe1981658eea3820a01c37e504bb4d \ - --hash=sha256:8476f9903e93fbde4f6c327f74d79e9b4bd0ed9294c5dfa3164ab8c581b5de2a - # via pyElli (pyproject.toml) numpy==1.23.2 \ --hash=sha256:17e5226674f6ea79e14e3b91bfbc153fdf3ac13f5cc54ee7bc8fdbe820a32da0 \ --hash=sha256:2bd879d3ca4b6f39b7770829f73278b7c5e248c91d538aab1e506c628353e47f \ diff --git a/scripts/generate_requirements.sh b/scripts/generate_requirements.sh index ff90af1b..65b448f5 100755 --- a/scripts/generate_requirements.sh +++ b/scripts/generate_requirements.sh @@ -1,11 +1,11 @@ #!/bin/bash -pip-compile --generate-hashes --output-file=requirements/requirements.txt pyproject.toml +pip-compile --resolver=backtracking --generate-hashes --output-file=requirements/requirements.txt pyproject.toml -pip-compile --extra=fitting --generate-hashes --output-file=requirements/fitting-requirements.txt \ +pip-compile --resolver=backtracking --extra=fitting --generate-hashes --output-file=requirements/fitting-requirements.txt \ requirements/requirements.txt pyproject.toml -pip-compile --extra=fitting --extra=testing --generate-hashes \ +pip-compile --resolver=backtracking --extra=fitting --extra=testing --generate-hashes \ --output-file=requirements/dev-requirements.txt \ requirements/fitting-requirements.txt \ pyproject.toml \ No newline at end of file From b75c9169a6bb00e7ca699c28598557e4ab185e82 Mon Sep 17 00:00:00 2001 From: domna Date: Thu, 18 May 2023 13:32:16 +0200 Subject: [PATCH 4/4] Updates formula-dispersion --- pyproject.toml | 2 +- requirements/dev-requirements.txt | 134 +++++++++++++------------- requirements/fitting-requirements.txt | 134 +++++++++++++------------- requirements/requirements.txt | 134 +++++++++++++------------- 4 files changed, 202 insertions(+), 202 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 3668f257..7ada152f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,7 +30,7 @@ dependencies = [ "importlib-resources", "rapidfuzz", "pint", - "formula-dispersion", + "formula-dispersion>=0.1.2", ] [project.optional-dependencies] diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt index 0215f4ea..d821d0fd 100644 --- a/requirements/dev-requirements.txt +++ b/requirements/dev-requirements.txt @@ -263,73 +263,73 @@ fonttools==4.37.1 \ # via # -r requirements/fitting-requirements.txt # matplotlib -formula-dispersion==0.1.1 \ - --hash=sha256:096e75d1904428d541f837cdf9c3ceb51f979cf79d85dcf289222935f9782e08 \ - --hash=sha256:112a346462847b215338452ec29bfac9080ae1f88eb20f821a317ba9a7e705b9 \ - --hash=sha256:192010f7e92ab8218559a7e018ffd518e5b85bfe87d77be3bf9193f70fae695b \ - --hash=sha256:20110b10f7fe63769542cdfe873790f125599c7ea09eed5427fb15c88d7c6085 \ - --hash=sha256:2177fc3225d60ceae9f2171b527384fdf53f723b120318c855221de1390c46ab \ - --hash=sha256:252fd46b673d87ed18ffe84be3613588677a1daae77fc63665678f048c5807c4 \ - --hash=sha256:25b5166a75aa369df581ae5a905bc1951ee84a571c30d32adc98bbdb576152c1 \ - --hash=sha256:314fd6add25d295bf2c01c9333b907d9882b6e345a7c9c7818ac3ee4470401ac \ - --hash=sha256:31a5cda79135485f62c91a25661d932f00d4b2ad7084fd73ce3e83aba423018c \ - --hash=sha256:3640396c0dc1bbec3f70da2edbf7f7eea776b01c1913897fc0c0c37fa4dad749 \ - --hash=sha256:372ecbd652c8e6d17fb20bff9f3ba492a8a7040586cee8fe7c5f742429b79fe8 \ - --hash=sha256:3874a177cc3f5b8511dcc78d136cd2ee4fb91903ca3af49439cd80a5cf2443b9 \ - --hash=sha256:39b5b34628863cb91f1bd027c07b967431837b0918ab69873afc481692f311b4 \ - --hash=sha256:4023c3571ce3dfa7f923e2cec6598c92de2e470fd702c5fd071438681f7a8b00 \ - --hash=sha256:40df8bb2d5665eeef1ab247a83c5990df5b43413b61076f20f68b6b46fe2dd03 \ - --hash=sha256:4215edbeb5ce366ff51c304265bee58e4ad69c53b7d367d37fee99ce8b13b1b4 \ - --hash=sha256:43c2de9d0e150fa22942fd0d752fa7252423b8a544e4e7cdd6c199a5070ccf54 \ - --hash=sha256:4f2de0f0696fafa5b6ead8d2005d99d81b3d301e4c774a5275257b95aca85da0 \ - --hash=sha256:578d79e03e4675ad9610e87b747c25d76d801265c3c6d3fc66ca411c925ce203 \ - --hash=sha256:5a94b69f936d694e44c7e7abbe8aa7dfa161a7c2ac2ef9c7d1372420837b5611 \ - --hash=sha256:68429570e86b498c6b1942975ccbf049ee53017c5a4edbc922c73dee57302181 \ - --hash=sha256:6df0b8cb60549b659cdb66a65dfde0ec98bae35c80944dbcefb5751e8f18d789 \ - --hash=sha256:7022e5592c4128a00d8bc3a1208194313fbd516428122a9c59b0933bc3394e70 \ - --hash=sha256:708cc699054993696d9c29d096fb41c50debcf2925dcab54f6c0904fa012f1d2 \ - --hash=sha256:753c14c5dcd1c72338fd80d2358f593b15c496cd3073df39eb09fb0e0ec1ae4c \ - --hash=sha256:77e1b523307eb9e929a27a400bb5a01ea868d8658693f09851a51ff477a9ca0b \ - --hash=sha256:7db61817c66de0b3586e83a886b75c54e1b8b08a62b00475d0945b418a417d34 \ - --hash=sha256:819438210314847ee51d35f8a6a23000e16d707c0159ccf4401edee43d1d5f09 \ - --hash=sha256:82f6dcb93cc2295c7e45cee1c8d6bca79f348aea90324a39b37eed7a04e3f3a8 \ - --hash=sha256:8716dd7d8e086dd3708012fdc6b8238cb6bf90bad1882f0cbff14ebefbeb8da6 \ - --hash=sha256:872f76f29005c4dc351957bc2666cc4740e2306f929599a08764a9c9424d298f \ - --hash=sha256:88609c76acd14015a6e7072509db512d239700171997132ef0fd30e0200a6acd \ - --hash=sha256:8e82b4185dc3fde7bbee3d5be28b0fe183d8aa50336178bb61d21ee606c70e32 \ - --hash=sha256:8edae27f9c6bb56523bf9507b7ff7b4274e49889da6078661e4e225038f89bbf \ - --hash=sha256:8ede82adda7fcc2c4f317879a81e16d9d0d47f8aa93d2389cfa74ee66fe8bcd0 \ - --hash=sha256:90e68346ea3c98c301c6cec6f7fd519c52825e3010aaa8f55cc56f9e27872ed3 \ - --hash=sha256:92e722955d2f2bd33147d3985756a3a5e2c828dff9612f34a84ecaacea5ee98e \ - --hash=sha256:992535411f33cf0ef1baed284997039b7236bbd383c189606cfe72cb05cdac38 \ - --hash=sha256:9b9594d82d5bbff8bc465423887daa6f6f8ee1818c2ce4fe3752e4d5d5df9e42 \ - --hash=sha256:a69d0511760d8b8131617b8be5fa067b2a94ceae6ccfe3c5f77e626fc5fd9cec \ - --hash=sha256:a745f85aa88fdf54531a0dc2144caa46188feaab94b90ff827ad01b3d1ca07ab \ - --hash=sha256:aae9e6b750f988b84b6149a70db1f4dedd1bb7585025df964b771617feb4d54b \ - --hash=sha256:abcee79ce6f6d05203c71bce22344b821db37a52a071706c21b03aa5a60bb292 \ - --hash=sha256:b127dc5aaf3bf0c671629e47aa72bd38aaab90984537ab9d8324437a9674fb81 \ - --hash=sha256:b37f430fbb14ba5fe7b8deacbb5cd8148a488bb5e98c58a4117d696a8b048d0b \ - --hash=sha256:bbd5220d878492f74fe8185ffe86bf006c4662f7c7057ea03f75e43f8565e483 \ - --hash=sha256:c3c7bee36877695b1fe5ec87c6940bd4124fea3de5caad592f5ba423b058c628 \ - --hash=sha256:c57fb8bd4f9e675170dc75ebcc33cd4243e13bd6498ce496dd50398452cf9439 \ - --hash=sha256:c6e4097a9eff4211e6b15eb613201461d56e1c74f6179eb55b1b89efa1b55821 \ - --hash=sha256:c7a9fb9ee7e92b5ecff66ba95096e393da78da2d522793fcc6b69d912a92a22d \ - --hash=sha256:cca2827afb41bd517a373c48e7cd35a454dd12773d2439b17e421328d5f4aebe \ - --hash=sha256:d0f1f35a9bb44a8257ed8b7639f98abf9586767c9366cc806670e5c9fdb6633a \ - --hash=sha256:d726b0f880f812d35d82803675c2282d5a045b9f05b09a1e3c55394d88082b4d \ - --hash=sha256:d948420a80f67f314c3bb8ec9e477fa3062ae1f9b5051b8bb6f8361e4d085fc1 \ - --hash=sha256:dbfe39c96d4aa45aaf1fa39501dc8000935b8ccac6b7fbdf324a4e9b5f6dd259 \ - --hash=sha256:e4534c40729070f77b55c108a58d86f97e6ea4f2e75de3912114e2884faaf0a6 \ - --hash=sha256:e4c51a898db124cd8b7000bd8bc2af3000ce72b2fb61931df7366fa8690cb830 \ - --hash=sha256:e4de1d94a2d8eda97f23f991eb83682e4d083cf7d72db85f0514d0d098fcc08a \ - --hash=sha256:e50aad7522771c8700b8a1563fbc8f439c7fbff96ea5ec9bf7f99fabf596dc76 \ - --hash=sha256:f625f43c7ad9a271b99444ce6cee119f65d40e9352773860a3f16ef69bc3cc59 \ - --hash=sha256:f73bbbf15abd15c9df1fdccd3a631c43e510a515f79bb8d370c010759b5f19c3 \ - --hash=sha256:f7cb9a578de6919291e2ad86660c621c3f111d1e2b4b6f8b75127430ad3c9cb5 \ - --hash=sha256:fc07083dcf0a399a0576f5e776cefba0637ef3e08c1ec75d309945bcbe0d15ba \ - --hash=sha256:fe443f0378a20a8c8bf2dee8e96b0f32450e1977808379082a35c0a468e3bf7c \ - --hash=sha256:ff38bd528ac9a8af7d89ba7ae923e1289465eda76ab5be96a1258baf8118c897 \ - --hash=sha256:ff511575e957df3aea58eb1f36e1d7b1fa8fd65552fb0032e52c9a2dc754e670 +formula-dispersion==0.1.2 \ + --hash=sha256:0040412ec3a02fc69055e0f4cf8f661350efc56a3fc4ecfdc9284b6d5773a627 \ + --hash=sha256:010d89d15cc4a12d92bf0ad95cb14292e59cc1f5654a25e93c3453d4fb8d31c2 \ + --hash=sha256:0323e88cd494ea0955f59396ef493c6adfba6f98bd01cf3018b006264689fb5f \ + --hash=sha256:05a63bd889460a6edbf463ef695741fabeb29f97af9887ccb53a111e61488da4 \ + --hash=sha256:107f9446863ee7d1422c54ea38b4d2cbffcfc7f1c8aa521a1fc631444299a7ea \ + --hash=sha256:10e5cc18cc57923048e52b03a6bf27a898d1e8f7f82345a9e5cfac563f788a66 \ + --hash=sha256:189582669edf2d474e19299b896e73e2699a0d734d73a7ab102789b84701225a \ + --hash=sha256:192f2fbecf74b8fd4abfda23bd3382e24cfd04dd32272ecb86b5b997c026e1e4 \ + --hash=sha256:1abe27cc65d18951db941d49426d28630920b1e7f4e8588eb49df1a1705fb57d \ + --hash=sha256:1af600397418a8a26a2173e972496f0e80bcd1cb361693908ba37389adbdc689 \ + --hash=sha256:22f3820d3f574cdc1f85e81ec06fd67e127fc73688c6d375d5399cea83996d08 \ + --hash=sha256:24ff7173d2b02e4fcc0cb4598aad16651b0b2edbdc88275b59daf7fc9ae65385 \ + --hash=sha256:251fba322893483070a88efe461cb74589a70f9a2b8b21b9c135e52f7c4e955a \ + --hash=sha256:33377d49127895c035b73b9e87dd6a91e7e675c65db45e71a5fada624b19b526 \ + --hash=sha256:34a9648bc48fea0e41729f4d53fda57b8e1342642f0a136480bb58f1822b0773 \ + --hash=sha256:41f0ef4442f3ea175949d6bf9e7c924d3522e6acc3ed0cd8a45f413a3e284766 \ + --hash=sha256:49360258d9c7ccddb313d78d42adb1bd2ceb824e79543f4bf0a287a4f88c05d5 \ + --hash=sha256:4b11e904adee624b75b3c617af019c5b8247e4310664aee5d08ec9946a837934 \ + --hash=sha256:50745c714123e20c1b23b3c4c80f4f8875ebe717ed16c77146f8623159e081c1 \ + --hash=sha256:53bb34a1906cf6e61b6eae81fed3c0eab4e4ec2235a4be9931748c6f52c378e6 \ + --hash=sha256:548628e639e1304567fa129e502f2196bb56937fc3d30893295ca99b76d43482 \ + --hash=sha256:56867f3660dbc8b413bd5a5ca32343d39b81797643f8dbea92fed19915fe32d6 \ + --hash=sha256:5983a96237660428d8d748000c9c0f0c73602360a2f9670e0212563e14e520fe \ + --hash=sha256:5bd4a311c4101dca13de23d081c36a384ac7c2186395b00e9660d8b829ef3dd1 \ + --hash=sha256:6420ef098b3a20b5466d9bd1b03e43deabaedb3907362332a3fbdd2ee0e2ac50 \ + --hash=sha256:6547d5ccb8706790e81bc9f5e5886915317e2b150d3e2cdc552eb3e162fe4a23 \ + --hash=sha256:692cba1fe033328c88afa54c0176773c797fa8de2699dba53242a676291fa29e \ + --hash=sha256:6b7365a1498559f5183721a40bf0ce99a8e340264e8e50cb28fad5f0a1ac2f9e \ + --hash=sha256:7287d0f339d64458a444f91142cc5a2bbe2b19217ea67bd2860a43a52a92c02d \ + --hash=sha256:7775ade7579c91cd3895823899bbe57491ece9f4e6e409b9623b02616a93d64d \ + --hash=sha256:79d2d0b7156065cebc4323a9426fff139da37b80cad9b1501ed2525ebc88e955 \ + --hash=sha256:7cce3d64a7870e6ff959b26a1321a2f2d6a09717c27ee9f8cc142b127bf16042 \ + --hash=sha256:819abae0187337c6871996a1304927329383bc606251ad88e1bd51c31569f924 \ + --hash=sha256:82ebde297209caeb48d095798d989f59af477fa386d97db5d0b7caeb866dd3f4 \ + --hash=sha256:8f699319475817577ddbb38c62f87e57fd7f7a89657332f3cbe58f27f903dcd4 \ + --hash=sha256:8f73fc3b166df8e23514657c6594c1260268e86106b12dad271f1f393617d0ec \ + --hash=sha256:914a42a1cd3fe46705156c59e1db33db2b88545df49732aa8822f286046d82cc \ + --hash=sha256:9eaef7070ccd955a96bd227ee6b3d6609ae9203f0f3c0abe831cf2b4baf28846 \ + --hash=sha256:a0e7e43f0ff849e089e452f244cf20d3ea3b251bed76416832edc5dc6d6e7663 \ + --hash=sha256:a55273aca55fcaa7f8f57d39ab3ad7b25540ca4fb2666f7eab7759f21f1dc19e \ + --hash=sha256:a8deb1743282d86b1aebfc77b35aaba2b6bd7a46a2e16539fdd2811cd5320a84 \ + --hash=sha256:aa56ea82b13f128eca27cc093d7ba1240d05abf5bfd77874abe4865fca0855ad \ + --hash=sha256:aa7b2346af62700719a6a2dc200e8db77488bd3616a853b9141b52c8800a0b84 \ + --hash=sha256:bf83c2ea18667ce30ce489827f3fe3108d4fa7e6dea37023ca8e3a2a8d6a6743 \ + --hash=sha256:bfde9e5f5d6680ac5824c3f66138f777ca65a451357be6775c91367697a6271d \ + --hash=sha256:c6ec4f997ae2b3477bd50d1e714934c4e0a7344d61c8ce7c2e2876ae1d37d15d \ + --hash=sha256:c790268dcfc9a1141e0e488a5b8570184e61fbc2fa5c0cfeb9c0b1beb56261f5 \ + --hash=sha256:c825540673ff7b36cfcec27084d5fab6385b8075c1ee2592479f044f37053e56 \ + --hash=sha256:c8bce86dcaa9547052f538d02e8c4fe2f1f5a3b957075caf1fa7798255ef3af1 \ + --hash=sha256:ca89ee345248965002462160c9d7c4bce10be69e970a4e5cee85166b526927d2 \ + --hash=sha256:cd7e6065de65e3771b397e8a547d1aaf14b56f64ce313c9020f51c365ccfd9d7 \ + --hash=sha256:cdc7c5b00002ca98da20ccdd2d7e8ff3af26a41e33d760f3c06ff1456bfc6cdd \ + --hash=sha256:cfd92df86e7419111fc2029355b9483c4b46084016427f43e5106ce9ed9e5862 \ + --hash=sha256:d1ae6404a879549a67dc30774b0381dd14159d83cd3f3156956cce045c950cad \ + --hash=sha256:d2d831b5fe7c8009b4b2821be5c665d38da186d90afdac5cc28877a42e949766 \ + --hash=sha256:d9051b73be64a8e2f6044f3ec1364835cb21414d0ba261ea4b68a7f81865776e \ + --hash=sha256:d9378e63867c473c894d69affe0c70f5322bf2fd48bd27b5d0f612b48dee947b \ + --hash=sha256:d98db634abd5a112449c257a991389ee3fd5a9f328a37daf425a7e7e20c55a93 \ + --hash=sha256:d998142f4dc5f801c9bf1a77eca12e3a1323142530d96438eaa2c0871c514261 \ + --hash=sha256:db3bd0cdfd48a47e1a3c888a00e2f88b5970b5422addd44913063d56b4316cc7 \ + --hash=sha256:dff82baf856ae5433976a9c94bae3b921a04465951c885feeae4ed678d3e004a \ + --hash=sha256:e0e009ad5372af3e29f1f17141a76bec54101a6e3ded33e07447aca1042c05ca \ + --hash=sha256:e70de7fd86f817ed3f994c868199b66591fd17143bbfba8a60b51420cd09a197 \ + --hash=sha256:e9bd52c9a6313e97a94f3065804d46942275ed518213353c7c4f1d5c88fcf87b \ + --hash=sha256:ebc6a294ed7d085a1eb41d5a94c89b1e325e363d136774b35c3c73b5e3a4bdcb \ + --hash=sha256:fdcc3c06b0e20185376047bfa40b80c5b0a9b8623a8936b3f56f8ae1984c7b73 # via # -r requirements/fitting-requirements.txt # pyElli (pyproject.toml) diff --git a/requirements/fitting-requirements.txt b/requirements/fitting-requirements.txt index 608feadc..78ac6453 100644 --- a/requirements/fitting-requirements.txt +++ b/requirements/fitting-requirements.txt @@ -175,73 +175,73 @@ fonttools==4.37.1 \ --hash=sha256:4606e1a88ee1f6699d182fea9511bd9a8a915d913eab4584e5226da1180fcce7 \ --hash=sha256:fff6b752e326c15756c819fe2fe7ceab69f96a1dbcfe8911d0941cdb49905007 # via matplotlib -formula-dispersion==0.1.1 \ - --hash=sha256:096e75d1904428d541f837cdf9c3ceb51f979cf79d85dcf289222935f9782e08 \ - --hash=sha256:112a346462847b215338452ec29bfac9080ae1f88eb20f821a317ba9a7e705b9 \ - --hash=sha256:192010f7e92ab8218559a7e018ffd518e5b85bfe87d77be3bf9193f70fae695b \ - --hash=sha256:20110b10f7fe63769542cdfe873790f125599c7ea09eed5427fb15c88d7c6085 \ - --hash=sha256:2177fc3225d60ceae9f2171b527384fdf53f723b120318c855221de1390c46ab \ - --hash=sha256:252fd46b673d87ed18ffe84be3613588677a1daae77fc63665678f048c5807c4 \ - --hash=sha256:25b5166a75aa369df581ae5a905bc1951ee84a571c30d32adc98bbdb576152c1 \ - --hash=sha256:314fd6add25d295bf2c01c9333b907d9882b6e345a7c9c7818ac3ee4470401ac \ - --hash=sha256:31a5cda79135485f62c91a25661d932f00d4b2ad7084fd73ce3e83aba423018c \ - --hash=sha256:3640396c0dc1bbec3f70da2edbf7f7eea776b01c1913897fc0c0c37fa4dad749 \ - --hash=sha256:372ecbd652c8e6d17fb20bff9f3ba492a8a7040586cee8fe7c5f742429b79fe8 \ - --hash=sha256:3874a177cc3f5b8511dcc78d136cd2ee4fb91903ca3af49439cd80a5cf2443b9 \ - --hash=sha256:39b5b34628863cb91f1bd027c07b967431837b0918ab69873afc481692f311b4 \ - --hash=sha256:4023c3571ce3dfa7f923e2cec6598c92de2e470fd702c5fd071438681f7a8b00 \ - --hash=sha256:40df8bb2d5665eeef1ab247a83c5990df5b43413b61076f20f68b6b46fe2dd03 \ - --hash=sha256:4215edbeb5ce366ff51c304265bee58e4ad69c53b7d367d37fee99ce8b13b1b4 \ - --hash=sha256:43c2de9d0e150fa22942fd0d752fa7252423b8a544e4e7cdd6c199a5070ccf54 \ - --hash=sha256:4f2de0f0696fafa5b6ead8d2005d99d81b3d301e4c774a5275257b95aca85da0 \ - --hash=sha256:578d79e03e4675ad9610e87b747c25d76d801265c3c6d3fc66ca411c925ce203 \ - --hash=sha256:5a94b69f936d694e44c7e7abbe8aa7dfa161a7c2ac2ef9c7d1372420837b5611 \ - --hash=sha256:68429570e86b498c6b1942975ccbf049ee53017c5a4edbc922c73dee57302181 \ - --hash=sha256:6df0b8cb60549b659cdb66a65dfde0ec98bae35c80944dbcefb5751e8f18d789 \ - --hash=sha256:7022e5592c4128a00d8bc3a1208194313fbd516428122a9c59b0933bc3394e70 \ - --hash=sha256:708cc699054993696d9c29d096fb41c50debcf2925dcab54f6c0904fa012f1d2 \ - --hash=sha256:753c14c5dcd1c72338fd80d2358f593b15c496cd3073df39eb09fb0e0ec1ae4c \ - --hash=sha256:77e1b523307eb9e929a27a400bb5a01ea868d8658693f09851a51ff477a9ca0b \ - --hash=sha256:7db61817c66de0b3586e83a886b75c54e1b8b08a62b00475d0945b418a417d34 \ - --hash=sha256:819438210314847ee51d35f8a6a23000e16d707c0159ccf4401edee43d1d5f09 \ - --hash=sha256:82f6dcb93cc2295c7e45cee1c8d6bca79f348aea90324a39b37eed7a04e3f3a8 \ - --hash=sha256:8716dd7d8e086dd3708012fdc6b8238cb6bf90bad1882f0cbff14ebefbeb8da6 \ - --hash=sha256:872f76f29005c4dc351957bc2666cc4740e2306f929599a08764a9c9424d298f \ - --hash=sha256:88609c76acd14015a6e7072509db512d239700171997132ef0fd30e0200a6acd \ - --hash=sha256:8e82b4185dc3fde7bbee3d5be28b0fe183d8aa50336178bb61d21ee606c70e32 \ - --hash=sha256:8edae27f9c6bb56523bf9507b7ff7b4274e49889da6078661e4e225038f89bbf \ - --hash=sha256:8ede82adda7fcc2c4f317879a81e16d9d0d47f8aa93d2389cfa74ee66fe8bcd0 \ - --hash=sha256:90e68346ea3c98c301c6cec6f7fd519c52825e3010aaa8f55cc56f9e27872ed3 \ - --hash=sha256:92e722955d2f2bd33147d3985756a3a5e2c828dff9612f34a84ecaacea5ee98e \ - --hash=sha256:992535411f33cf0ef1baed284997039b7236bbd383c189606cfe72cb05cdac38 \ - --hash=sha256:9b9594d82d5bbff8bc465423887daa6f6f8ee1818c2ce4fe3752e4d5d5df9e42 \ - --hash=sha256:a69d0511760d8b8131617b8be5fa067b2a94ceae6ccfe3c5f77e626fc5fd9cec \ - --hash=sha256:a745f85aa88fdf54531a0dc2144caa46188feaab94b90ff827ad01b3d1ca07ab \ - --hash=sha256:aae9e6b750f988b84b6149a70db1f4dedd1bb7585025df964b771617feb4d54b \ - --hash=sha256:abcee79ce6f6d05203c71bce22344b821db37a52a071706c21b03aa5a60bb292 \ - --hash=sha256:b127dc5aaf3bf0c671629e47aa72bd38aaab90984537ab9d8324437a9674fb81 \ - --hash=sha256:b37f430fbb14ba5fe7b8deacbb5cd8148a488bb5e98c58a4117d696a8b048d0b \ - --hash=sha256:bbd5220d878492f74fe8185ffe86bf006c4662f7c7057ea03f75e43f8565e483 \ - --hash=sha256:c3c7bee36877695b1fe5ec87c6940bd4124fea3de5caad592f5ba423b058c628 \ - --hash=sha256:c57fb8bd4f9e675170dc75ebcc33cd4243e13bd6498ce496dd50398452cf9439 \ - --hash=sha256:c6e4097a9eff4211e6b15eb613201461d56e1c74f6179eb55b1b89efa1b55821 \ - --hash=sha256:c7a9fb9ee7e92b5ecff66ba95096e393da78da2d522793fcc6b69d912a92a22d \ - --hash=sha256:cca2827afb41bd517a373c48e7cd35a454dd12773d2439b17e421328d5f4aebe \ - --hash=sha256:d0f1f35a9bb44a8257ed8b7639f98abf9586767c9366cc806670e5c9fdb6633a \ - --hash=sha256:d726b0f880f812d35d82803675c2282d5a045b9f05b09a1e3c55394d88082b4d \ - --hash=sha256:d948420a80f67f314c3bb8ec9e477fa3062ae1f9b5051b8bb6f8361e4d085fc1 \ - --hash=sha256:dbfe39c96d4aa45aaf1fa39501dc8000935b8ccac6b7fbdf324a4e9b5f6dd259 \ - --hash=sha256:e4534c40729070f77b55c108a58d86f97e6ea4f2e75de3912114e2884faaf0a6 \ - --hash=sha256:e4c51a898db124cd8b7000bd8bc2af3000ce72b2fb61931df7366fa8690cb830 \ - --hash=sha256:e4de1d94a2d8eda97f23f991eb83682e4d083cf7d72db85f0514d0d098fcc08a \ - --hash=sha256:e50aad7522771c8700b8a1563fbc8f439c7fbff96ea5ec9bf7f99fabf596dc76 \ - --hash=sha256:f625f43c7ad9a271b99444ce6cee119f65d40e9352773860a3f16ef69bc3cc59 \ - --hash=sha256:f73bbbf15abd15c9df1fdccd3a631c43e510a515f79bb8d370c010759b5f19c3 \ - --hash=sha256:f7cb9a578de6919291e2ad86660c621c3f111d1e2b4b6f8b75127430ad3c9cb5 \ - --hash=sha256:fc07083dcf0a399a0576f5e776cefba0637ef3e08c1ec75d309945bcbe0d15ba \ - --hash=sha256:fe443f0378a20a8c8bf2dee8e96b0f32450e1977808379082a35c0a468e3bf7c \ - --hash=sha256:ff38bd528ac9a8af7d89ba7ae923e1289465eda76ab5be96a1258baf8118c897 \ - --hash=sha256:ff511575e957df3aea58eb1f36e1d7b1fa8fd65552fb0032e52c9a2dc754e670 +formula-dispersion==0.1.2 \ + --hash=sha256:0040412ec3a02fc69055e0f4cf8f661350efc56a3fc4ecfdc9284b6d5773a627 \ + --hash=sha256:010d89d15cc4a12d92bf0ad95cb14292e59cc1f5654a25e93c3453d4fb8d31c2 \ + --hash=sha256:0323e88cd494ea0955f59396ef493c6adfba6f98bd01cf3018b006264689fb5f \ + --hash=sha256:05a63bd889460a6edbf463ef695741fabeb29f97af9887ccb53a111e61488da4 \ + --hash=sha256:107f9446863ee7d1422c54ea38b4d2cbffcfc7f1c8aa521a1fc631444299a7ea \ + --hash=sha256:10e5cc18cc57923048e52b03a6bf27a898d1e8f7f82345a9e5cfac563f788a66 \ + --hash=sha256:189582669edf2d474e19299b896e73e2699a0d734d73a7ab102789b84701225a \ + --hash=sha256:192f2fbecf74b8fd4abfda23bd3382e24cfd04dd32272ecb86b5b997c026e1e4 \ + --hash=sha256:1abe27cc65d18951db941d49426d28630920b1e7f4e8588eb49df1a1705fb57d \ + --hash=sha256:1af600397418a8a26a2173e972496f0e80bcd1cb361693908ba37389adbdc689 \ + --hash=sha256:22f3820d3f574cdc1f85e81ec06fd67e127fc73688c6d375d5399cea83996d08 \ + --hash=sha256:24ff7173d2b02e4fcc0cb4598aad16651b0b2edbdc88275b59daf7fc9ae65385 \ + --hash=sha256:251fba322893483070a88efe461cb74589a70f9a2b8b21b9c135e52f7c4e955a \ + --hash=sha256:33377d49127895c035b73b9e87dd6a91e7e675c65db45e71a5fada624b19b526 \ + --hash=sha256:34a9648bc48fea0e41729f4d53fda57b8e1342642f0a136480bb58f1822b0773 \ + --hash=sha256:41f0ef4442f3ea175949d6bf9e7c924d3522e6acc3ed0cd8a45f413a3e284766 \ + --hash=sha256:49360258d9c7ccddb313d78d42adb1bd2ceb824e79543f4bf0a287a4f88c05d5 \ + --hash=sha256:4b11e904adee624b75b3c617af019c5b8247e4310664aee5d08ec9946a837934 \ + --hash=sha256:50745c714123e20c1b23b3c4c80f4f8875ebe717ed16c77146f8623159e081c1 \ + --hash=sha256:53bb34a1906cf6e61b6eae81fed3c0eab4e4ec2235a4be9931748c6f52c378e6 \ + --hash=sha256:548628e639e1304567fa129e502f2196bb56937fc3d30893295ca99b76d43482 \ + --hash=sha256:56867f3660dbc8b413bd5a5ca32343d39b81797643f8dbea92fed19915fe32d6 \ + --hash=sha256:5983a96237660428d8d748000c9c0f0c73602360a2f9670e0212563e14e520fe \ + --hash=sha256:5bd4a311c4101dca13de23d081c36a384ac7c2186395b00e9660d8b829ef3dd1 \ + --hash=sha256:6420ef098b3a20b5466d9bd1b03e43deabaedb3907362332a3fbdd2ee0e2ac50 \ + --hash=sha256:6547d5ccb8706790e81bc9f5e5886915317e2b150d3e2cdc552eb3e162fe4a23 \ + --hash=sha256:692cba1fe033328c88afa54c0176773c797fa8de2699dba53242a676291fa29e \ + --hash=sha256:6b7365a1498559f5183721a40bf0ce99a8e340264e8e50cb28fad5f0a1ac2f9e \ + --hash=sha256:7287d0f339d64458a444f91142cc5a2bbe2b19217ea67bd2860a43a52a92c02d \ + --hash=sha256:7775ade7579c91cd3895823899bbe57491ece9f4e6e409b9623b02616a93d64d \ + --hash=sha256:79d2d0b7156065cebc4323a9426fff139da37b80cad9b1501ed2525ebc88e955 \ + --hash=sha256:7cce3d64a7870e6ff959b26a1321a2f2d6a09717c27ee9f8cc142b127bf16042 \ + --hash=sha256:819abae0187337c6871996a1304927329383bc606251ad88e1bd51c31569f924 \ + --hash=sha256:82ebde297209caeb48d095798d989f59af477fa386d97db5d0b7caeb866dd3f4 \ + --hash=sha256:8f699319475817577ddbb38c62f87e57fd7f7a89657332f3cbe58f27f903dcd4 \ + --hash=sha256:8f73fc3b166df8e23514657c6594c1260268e86106b12dad271f1f393617d0ec \ + --hash=sha256:914a42a1cd3fe46705156c59e1db33db2b88545df49732aa8822f286046d82cc \ + --hash=sha256:9eaef7070ccd955a96bd227ee6b3d6609ae9203f0f3c0abe831cf2b4baf28846 \ + --hash=sha256:a0e7e43f0ff849e089e452f244cf20d3ea3b251bed76416832edc5dc6d6e7663 \ + --hash=sha256:a55273aca55fcaa7f8f57d39ab3ad7b25540ca4fb2666f7eab7759f21f1dc19e \ + --hash=sha256:a8deb1743282d86b1aebfc77b35aaba2b6bd7a46a2e16539fdd2811cd5320a84 \ + --hash=sha256:aa56ea82b13f128eca27cc093d7ba1240d05abf5bfd77874abe4865fca0855ad \ + --hash=sha256:aa7b2346af62700719a6a2dc200e8db77488bd3616a853b9141b52c8800a0b84 \ + --hash=sha256:bf83c2ea18667ce30ce489827f3fe3108d4fa7e6dea37023ca8e3a2a8d6a6743 \ + --hash=sha256:bfde9e5f5d6680ac5824c3f66138f777ca65a451357be6775c91367697a6271d \ + --hash=sha256:c6ec4f997ae2b3477bd50d1e714934c4e0a7344d61c8ce7c2e2876ae1d37d15d \ + --hash=sha256:c790268dcfc9a1141e0e488a5b8570184e61fbc2fa5c0cfeb9c0b1beb56261f5 \ + --hash=sha256:c825540673ff7b36cfcec27084d5fab6385b8075c1ee2592479f044f37053e56 \ + --hash=sha256:c8bce86dcaa9547052f538d02e8c4fe2f1f5a3b957075caf1fa7798255ef3af1 \ + --hash=sha256:ca89ee345248965002462160c9d7c4bce10be69e970a4e5cee85166b526927d2 \ + --hash=sha256:cd7e6065de65e3771b397e8a547d1aaf14b56f64ce313c9020f51c365ccfd9d7 \ + --hash=sha256:cdc7c5b00002ca98da20ccdd2d7e8ff3af26a41e33d760f3c06ff1456bfc6cdd \ + --hash=sha256:cfd92df86e7419111fc2029355b9483c4b46084016427f43e5106ce9ed9e5862 \ + --hash=sha256:d1ae6404a879549a67dc30774b0381dd14159d83cd3f3156956cce045c950cad \ + --hash=sha256:d2d831b5fe7c8009b4b2821be5c665d38da186d90afdac5cc28877a42e949766 \ + --hash=sha256:d9051b73be64a8e2f6044f3ec1364835cb21414d0ba261ea4b68a7f81865776e \ + --hash=sha256:d9378e63867c473c894d69affe0c70f5322bf2fd48bd27b5d0f612b48dee947b \ + --hash=sha256:d98db634abd5a112449c257a991389ee3fd5a9f328a37daf425a7e7e20c55a93 \ + --hash=sha256:d998142f4dc5f801c9bf1a77eca12e3a1323142530d96438eaa2c0871c514261 \ + --hash=sha256:db3bd0cdfd48a47e1a3c888a00e2f88b5970b5422addd44913063d56b4316cc7 \ + --hash=sha256:dff82baf856ae5433976a9c94bae3b921a04465951c885feeae4ed678d3e004a \ + --hash=sha256:e0e009ad5372af3e29f1f17141a76bec54101a6e3ded33e07447aca1042c05ca \ + --hash=sha256:e70de7fd86f817ed3f994c868199b66591fd17143bbfba8a60b51420cd09a197 \ + --hash=sha256:e9bd52c9a6313e97a94f3065804d46942275ed518213353c7c4f1d5c88fcf87b \ + --hash=sha256:ebc6a294ed7d085a1eb41d5a94c89b1e325e363d136774b35c3c73b5e3a4bdcb \ + --hash=sha256:fdcc3c06b0e20185376047bfa40b80c5b0a9b8623a8936b3f56f8ae1984c7b73 # via # -r requirements/requirements.txt # pyElli (pyproject.toml) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index c6d9b407..701ea15c 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -4,73 +4,73 @@ # # pip-compile --generate-hashes --output-file=requirements/requirements.txt --resolver=backtracking pyproject.toml # -formula-dispersion==0.1.1 \ - --hash=sha256:096e75d1904428d541f837cdf9c3ceb51f979cf79d85dcf289222935f9782e08 \ - --hash=sha256:112a346462847b215338452ec29bfac9080ae1f88eb20f821a317ba9a7e705b9 \ - --hash=sha256:192010f7e92ab8218559a7e018ffd518e5b85bfe87d77be3bf9193f70fae695b \ - --hash=sha256:20110b10f7fe63769542cdfe873790f125599c7ea09eed5427fb15c88d7c6085 \ - --hash=sha256:2177fc3225d60ceae9f2171b527384fdf53f723b120318c855221de1390c46ab \ - --hash=sha256:252fd46b673d87ed18ffe84be3613588677a1daae77fc63665678f048c5807c4 \ - --hash=sha256:25b5166a75aa369df581ae5a905bc1951ee84a571c30d32adc98bbdb576152c1 \ - --hash=sha256:314fd6add25d295bf2c01c9333b907d9882b6e345a7c9c7818ac3ee4470401ac \ - --hash=sha256:31a5cda79135485f62c91a25661d932f00d4b2ad7084fd73ce3e83aba423018c \ - --hash=sha256:3640396c0dc1bbec3f70da2edbf7f7eea776b01c1913897fc0c0c37fa4dad749 \ - --hash=sha256:372ecbd652c8e6d17fb20bff9f3ba492a8a7040586cee8fe7c5f742429b79fe8 \ - --hash=sha256:3874a177cc3f5b8511dcc78d136cd2ee4fb91903ca3af49439cd80a5cf2443b9 \ - --hash=sha256:39b5b34628863cb91f1bd027c07b967431837b0918ab69873afc481692f311b4 \ - --hash=sha256:4023c3571ce3dfa7f923e2cec6598c92de2e470fd702c5fd071438681f7a8b00 \ - --hash=sha256:40df8bb2d5665eeef1ab247a83c5990df5b43413b61076f20f68b6b46fe2dd03 \ - --hash=sha256:4215edbeb5ce366ff51c304265bee58e4ad69c53b7d367d37fee99ce8b13b1b4 \ - --hash=sha256:43c2de9d0e150fa22942fd0d752fa7252423b8a544e4e7cdd6c199a5070ccf54 \ - --hash=sha256:4f2de0f0696fafa5b6ead8d2005d99d81b3d301e4c774a5275257b95aca85da0 \ - --hash=sha256:578d79e03e4675ad9610e87b747c25d76d801265c3c6d3fc66ca411c925ce203 \ - --hash=sha256:5a94b69f936d694e44c7e7abbe8aa7dfa161a7c2ac2ef9c7d1372420837b5611 \ - --hash=sha256:68429570e86b498c6b1942975ccbf049ee53017c5a4edbc922c73dee57302181 \ - --hash=sha256:6df0b8cb60549b659cdb66a65dfde0ec98bae35c80944dbcefb5751e8f18d789 \ - --hash=sha256:7022e5592c4128a00d8bc3a1208194313fbd516428122a9c59b0933bc3394e70 \ - --hash=sha256:708cc699054993696d9c29d096fb41c50debcf2925dcab54f6c0904fa012f1d2 \ - --hash=sha256:753c14c5dcd1c72338fd80d2358f593b15c496cd3073df39eb09fb0e0ec1ae4c \ - --hash=sha256:77e1b523307eb9e929a27a400bb5a01ea868d8658693f09851a51ff477a9ca0b \ - --hash=sha256:7db61817c66de0b3586e83a886b75c54e1b8b08a62b00475d0945b418a417d34 \ - --hash=sha256:819438210314847ee51d35f8a6a23000e16d707c0159ccf4401edee43d1d5f09 \ - --hash=sha256:82f6dcb93cc2295c7e45cee1c8d6bca79f348aea90324a39b37eed7a04e3f3a8 \ - --hash=sha256:8716dd7d8e086dd3708012fdc6b8238cb6bf90bad1882f0cbff14ebefbeb8da6 \ - --hash=sha256:872f76f29005c4dc351957bc2666cc4740e2306f929599a08764a9c9424d298f \ - --hash=sha256:88609c76acd14015a6e7072509db512d239700171997132ef0fd30e0200a6acd \ - --hash=sha256:8e82b4185dc3fde7bbee3d5be28b0fe183d8aa50336178bb61d21ee606c70e32 \ - --hash=sha256:8edae27f9c6bb56523bf9507b7ff7b4274e49889da6078661e4e225038f89bbf \ - --hash=sha256:8ede82adda7fcc2c4f317879a81e16d9d0d47f8aa93d2389cfa74ee66fe8bcd0 \ - --hash=sha256:90e68346ea3c98c301c6cec6f7fd519c52825e3010aaa8f55cc56f9e27872ed3 \ - --hash=sha256:92e722955d2f2bd33147d3985756a3a5e2c828dff9612f34a84ecaacea5ee98e \ - --hash=sha256:992535411f33cf0ef1baed284997039b7236bbd383c189606cfe72cb05cdac38 \ - --hash=sha256:9b9594d82d5bbff8bc465423887daa6f6f8ee1818c2ce4fe3752e4d5d5df9e42 \ - --hash=sha256:a69d0511760d8b8131617b8be5fa067b2a94ceae6ccfe3c5f77e626fc5fd9cec \ - --hash=sha256:a745f85aa88fdf54531a0dc2144caa46188feaab94b90ff827ad01b3d1ca07ab \ - --hash=sha256:aae9e6b750f988b84b6149a70db1f4dedd1bb7585025df964b771617feb4d54b \ - --hash=sha256:abcee79ce6f6d05203c71bce22344b821db37a52a071706c21b03aa5a60bb292 \ - --hash=sha256:b127dc5aaf3bf0c671629e47aa72bd38aaab90984537ab9d8324437a9674fb81 \ - --hash=sha256:b37f430fbb14ba5fe7b8deacbb5cd8148a488bb5e98c58a4117d696a8b048d0b \ - --hash=sha256:bbd5220d878492f74fe8185ffe86bf006c4662f7c7057ea03f75e43f8565e483 \ - --hash=sha256:c3c7bee36877695b1fe5ec87c6940bd4124fea3de5caad592f5ba423b058c628 \ - --hash=sha256:c57fb8bd4f9e675170dc75ebcc33cd4243e13bd6498ce496dd50398452cf9439 \ - --hash=sha256:c6e4097a9eff4211e6b15eb613201461d56e1c74f6179eb55b1b89efa1b55821 \ - --hash=sha256:c7a9fb9ee7e92b5ecff66ba95096e393da78da2d522793fcc6b69d912a92a22d \ - --hash=sha256:cca2827afb41bd517a373c48e7cd35a454dd12773d2439b17e421328d5f4aebe \ - --hash=sha256:d0f1f35a9bb44a8257ed8b7639f98abf9586767c9366cc806670e5c9fdb6633a \ - --hash=sha256:d726b0f880f812d35d82803675c2282d5a045b9f05b09a1e3c55394d88082b4d \ - --hash=sha256:d948420a80f67f314c3bb8ec9e477fa3062ae1f9b5051b8bb6f8361e4d085fc1 \ - --hash=sha256:dbfe39c96d4aa45aaf1fa39501dc8000935b8ccac6b7fbdf324a4e9b5f6dd259 \ - --hash=sha256:e4534c40729070f77b55c108a58d86f97e6ea4f2e75de3912114e2884faaf0a6 \ - --hash=sha256:e4c51a898db124cd8b7000bd8bc2af3000ce72b2fb61931df7366fa8690cb830 \ - --hash=sha256:e4de1d94a2d8eda97f23f991eb83682e4d083cf7d72db85f0514d0d098fcc08a \ - --hash=sha256:e50aad7522771c8700b8a1563fbc8f439c7fbff96ea5ec9bf7f99fabf596dc76 \ - --hash=sha256:f625f43c7ad9a271b99444ce6cee119f65d40e9352773860a3f16ef69bc3cc59 \ - --hash=sha256:f73bbbf15abd15c9df1fdccd3a631c43e510a515f79bb8d370c010759b5f19c3 \ - --hash=sha256:f7cb9a578de6919291e2ad86660c621c3f111d1e2b4b6f8b75127430ad3c9cb5 \ - --hash=sha256:fc07083dcf0a399a0576f5e776cefba0637ef3e08c1ec75d309945bcbe0d15ba \ - --hash=sha256:fe443f0378a20a8c8bf2dee8e96b0f32450e1977808379082a35c0a468e3bf7c \ - --hash=sha256:ff38bd528ac9a8af7d89ba7ae923e1289465eda76ab5be96a1258baf8118c897 \ - --hash=sha256:ff511575e957df3aea58eb1f36e1d7b1fa8fd65552fb0032e52c9a2dc754e670 +formula-dispersion==0.1.2 \ + --hash=sha256:0040412ec3a02fc69055e0f4cf8f661350efc56a3fc4ecfdc9284b6d5773a627 \ + --hash=sha256:010d89d15cc4a12d92bf0ad95cb14292e59cc1f5654a25e93c3453d4fb8d31c2 \ + --hash=sha256:0323e88cd494ea0955f59396ef493c6adfba6f98bd01cf3018b006264689fb5f \ + --hash=sha256:05a63bd889460a6edbf463ef695741fabeb29f97af9887ccb53a111e61488da4 \ + --hash=sha256:107f9446863ee7d1422c54ea38b4d2cbffcfc7f1c8aa521a1fc631444299a7ea \ + --hash=sha256:10e5cc18cc57923048e52b03a6bf27a898d1e8f7f82345a9e5cfac563f788a66 \ + --hash=sha256:189582669edf2d474e19299b896e73e2699a0d734d73a7ab102789b84701225a \ + --hash=sha256:192f2fbecf74b8fd4abfda23bd3382e24cfd04dd32272ecb86b5b997c026e1e4 \ + --hash=sha256:1abe27cc65d18951db941d49426d28630920b1e7f4e8588eb49df1a1705fb57d \ + --hash=sha256:1af600397418a8a26a2173e972496f0e80bcd1cb361693908ba37389adbdc689 \ + --hash=sha256:22f3820d3f574cdc1f85e81ec06fd67e127fc73688c6d375d5399cea83996d08 \ + --hash=sha256:24ff7173d2b02e4fcc0cb4598aad16651b0b2edbdc88275b59daf7fc9ae65385 \ + --hash=sha256:251fba322893483070a88efe461cb74589a70f9a2b8b21b9c135e52f7c4e955a \ + --hash=sha256:33377d49127895c035b73b9e87dd6a91e7e675c65db45e71a5fada624b19b526 \ + --hash=sha256:34a9648bc48fea0e41729f4d53fda57b8e1342642f0a136480bb58f1822b0773 \ + --hash=sha256:41f0ef4442f3ea175949d6bf9e7c924d3522e6acc3ed0cd8a45f413a3e284766 \ + --hash=sha256:49360258d9c7ccddb313d78d42adb1bd2ceb824e79543f4bf0a287a4f88c05d5 \ + --hash=sha256:4b11e904adee624b75b3c617af019c5b8247e4310664aee5d08ec9946a837934 \ + --hash=sha256:50745c714123e20c1b23b3c4c80f4f8875ebe717ed16c77146f8623159e081c1 \ + --hash=sha256:53bb34a1906cf6e61b6eae81fed3c0eab4e4ec2235a4be9931748c6f52c378e6 \ + --hash=sha256:548628e639e1304567fa129e502f2196bb56937fc3d30893295ca99b76d43482 \ + --hash=sha256:56867f3660dbc8b413bd5a5ca32343d39b81797643f8dbea92fed19915fe32d6 \ + --hash=sha256:5983a96237660428d8d748000c9c0f0c73602360a2f9670e0212563e14e520fe \ + --hash=sha256:5bd4a311c4101dca13de23d081c36a384ac7c2186395b00e9660d8b829ef3dd1 \ + --hash=sha256:6420ef098b3a20b5466d9bd1b03e43deabaedb3907362332a3fbdd2ee0e2ac50 \ + --hash=sha256:6547d5ccb8706790e81bc9f5e5886915317e2b150d3e2cdc552eb3e162fe4a23 \ + --hash=sha256:692cba1fe033328c88afa54c0176773c797fa8de2699dba53242a676291fa29e \ + --hash=sha256:6b7365a1498559f5183721a40bf0ce99a8e340264e8e50cb28fad5f0a1ac2f9e \ + --hash=sha256:7287d0f339d64458a444f91142cc5a2bbe2b19217ea67bd2860a43a52a92c02d \ + --hash=sha256:7775ade7579c91cd3895823899bbe57491ece9f4e6e409b9623b02616a93d64d \ + --hash=sha256:79d2d0b7156065cebc4323a9426fff139da37b80cad9b1501ed2525ebc88e955 \ + --hash=sha256:7cce3d64a7870e6ff959b26a1321a2f2d6a09717c27ee9f8cc142b127bf16042 \ + --hash=sha256:819abae0187337c6871996a1304927329383bc606251ad88e1bd51c31569f924 \ + --hash=sha256:82ebde297209caeb48d095798d989f59af477fa386d97db5d0b7caeb866dd3f4 \ + --hash=sha256:8f699319475817577ddbb38c62f87e57fd7f7a89657332f3cbe58f27f903dcd4 \ + --hash=sha256:8f73fc3b166df8e23514657c6594c1260268e86106b12dad271f1f393617d0ec \ + --hash=sha256:914a42a1cd3fe46705156c59e1db33db2b88545df49732aa8822f286046d82cc \ + --hash=sha256:9eaef7070ccd955a96bd227ee6b3d6609ae9203f0f3c0abe831cf2b4baf28846 \ + --hash=sha256:a0e7e43f0ff849e089e452f244cf20d3ea3b251bed76416832edc5dc6d6e7663 \ + --hash=sha256:a55273aca55fcaa7f8f57d39ab3ad7b25540ca4fb2666f7eab7759f21f1dc19e \ + --hash=sha256:a8deb1743282d86b1aebfc77b35aaba2b6bd7a46a2e16539fdd2811cd5320a84 \ + --hash=sha256:aa56ea82b13f128eca27cc093d7ba1240d05abf5bfd77874abe4865fca0855ad \ + --hash=sha256:aa7b2346af62700719a6a2dc200e8db77488bd3616a853b9141b52c8800a0b84 \ + --hash=sha256:bf83c2ea18667ce30ce489827f3fe3108d4fa7e6dea37023ca8e3a2a8d6a6743 \ + --hash=sha256:bfde9e5f5d6680ac5824c3f66138f777ca65a451357be6775c91367697a6271d \ + --hash=sha256:c6ec4f997ae2b3477bd50d1e714934c4e0a7344d61c8ce7c2e2876ae1d37d15d \ + --hash=sha256:c790268dcfc9a1141e0e488a5b8570184e61fbc2fa5c0cfeb9c0b1beb56261f5 \ + --hash=sha256:c825540673ff7b36cfcec27084d5fab6385b8075c1ee2592479f044f37053e56 \ + --hash=sha256:c8bce86dcaa9547052f538d02e8c4fe2f1f5a3b957075caf1fa7798255ef3af1 \ + --hash=sha256:ca89ee345248965002462160c9d7c4bce10be69e970a4e5cee85166b526927d2 \ + --hash=sha256:cd7e6065de65e3771b397e8a547d1aaf14b56f64ce313c9020f51c365ccfd9d7 \ + --hash=sha256:cdc7c5b00002ca98da20ccdd2d7e8ff3af26a41e33d760f3c06ff1456bfc6cdd \ + --hash=sha256:cfd92df86e7419111fc2029355b9483c4b46084016427f43e5106ce9ed9e5862 \ + --hash=sha256:d1ae6404a879549a67dc30774b0381dd14159d83cd3f3156956cce045c950cad \ + --hash=sha256:d2d831b5fe7c8009b4b2821be5c665d38da186d90afdac5cc28877a42e949766 \ + --hash=sha256:d9051b73be64a8e2f6044f3ec1364835cb21414d0ba261ea4b68a7f81865776e \ + --hash=sha256:d9378e63867c473c894d69affe0c70f5322bf2fd48bd27b5d0f612b48dee947b \ + --hash=sha256:d98db634abd5a112449c257a991389ee3fd5a9f328a37daf425a7e7e20c55a93 \ + --hash=sha256:d998142f4dc5f801c9bf1a77eca12e3a1323142530d96438eaa2c0871c514261 \ + --hash=sha256:db3bd0cdfd48a47e1a3c888a00e2f88b5970b5422addd44913063d56b4316cc7 \ + --hash=sha256:dff82baf856ae5433976a9c94bae3b921a04465951c885feeae4ed678d3e004a \ + --hash=sha256:e0e009ad5372af3e29f1f17141a76bec54101a6e3ded33e07447aca1042c05ca \ + --hash=sha256:e70de7fd86f817ed3f994c868199b66591fd17143bbfba8a60b51420cd09a197 \ + --hash=sha256:e9bd52c9a6313e97a94f3065804d46942275ed518213353c7c4f1d5c88fcf87b \ + --hash=sha256:ebc6a294ed7d085a1eb41d5a94c89b1e325e363d136774b35c3c73b5e3a4bdcb \ + --hash=sha256:fdcc3c06b0e20185376047bfa40b80c5b0a9b8623a8936b3f56f8ae1984c7b73 # via pyElli (pyproject.toml) h5py==3.7.0 \ --hash=sha256:03d64fb86bb86b978928bad923b64419a23e836499ec6363e305ad28afd9d287 \