Couldn't fetch the linked file.
Draft: Resolve "Daskify LISA Instrument"
All threads resolved!
All threads resolved!
Compare changes
Files
2- Olaf Hartwig authored
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 460
− 321
@@ -52,21 +52,18 @@ typing-extensions = {version = ">=4.0.0", markers = "python_version < \"3.11\""}
@@ -402,6 +399,17 @@ files = [
@@ -432,76 +440,65 @@ test = ["pytest"]
@@ -516,73 +513,73 @@ test-no-images = ["pytest", "pytest-cov", "pytest-rerunfailures", "pytest-xdist"
@@ -606,39 +603,68 @@ files = [
@@ -757,59 +783,61 @@ typing = ["typing-extensions (>=4.12.2)"]
@@ -826,6 +854,45 @@ ufo = ["fs (>=2.2.0,<3)"]
test-full = ["adlfs", "aiohttp (!=4.0.0a0,!=4.0.0a1)", "cloudpickle", "dask", "distributed", "dropbox", "dropboxdrivefs", "fastparquet", "fusepy", "gcsfs", "jinja2", "kerchunk", "libarchive-c", "lz4", "notebook", "numpy", "ocifs", "pandas", "panel", "paramiko", "pyarrow", "pyarrow (>=1)", "pyftpdlib", "pygit2", "pytest", "pytest-asyncio (!=0.22.0)", "pytest-benchmark", "pytest-cov", "pytest-mock", "pytest-recording", "pytest-rerunfailures", "python-snappy", "requests", "smbprotocol", "tqdm", "urllib3", "zarr", "zstandard"]
@@ -866,13 +933,13 @@ numpy = ">=1.19.3"
@@ -972,13 +1039,13 @@ test = ["flaky", "ipyparallel", "pre-commit", "pytest (>=7.0)", "pytest-asyncio
@@ -988,16 +1055,16 @@ exceptiongroup = {version = "*", markers = "python_version < \"3.11\""}
@@ -1024,22 +1091,22 @@ colors = ["colorama (>=0.4.6)"]
docs = ["Jinja2 (==2.11.3)", "MarkupSafe (==1.1.1)", "Pygments (==2.8.1)", "alabaster (==0.7.12)", "babel (==2.9.1)", "chardet (==4.0.0)", "commonmark (==0.8.1)", "docutils (==0.17.1)", "future (==0.18.2)", "idna (==2.10)", "imagesize (==1.2.0)", "mock (==1.0.1)", "packaging (==20.9)", "pyparsing (==2.4.7)", "pytz (==2021.1)", "readthedocs-sphinx-ext (==2.1.4)", "recommonmark (==0.5.0)", "requests (==2.25.1)", "six (==1.15.0)", "snowballstemmer (==2.1.0)", "sphinx (==1.8.5)", "sphinx-rtd-theme (==0.4.3)", "sphinxcontrib-serializinghtml (==1.1.4)", "sphinxcontrib-websupport (==1.2.4)", "urllib3 (==1.26.4)"]
@@ -1245,6 +1312,17 @@ files = [
@@ -1356,51 +1434,52 @@ files = [
@@ -1415,7 +1494,7 @@ pyparsing = ">=2.3.1"
@@ -1650,13 +1729,13 @@ files = [
@@ -1674,6 +1753,24 @@ files = [
@@ -1988,17 +2085,17 @@ windows-terminal = ["colorama (>=0.4.6)"]
@@ -2042,13 +2139,13 @@ files = [
@@ -2394,23 +2491,23 @@ test = ["Cython", "array-api-strict (>=2.0)", "asv", "gmpy2", "hypothesis (>=6.3
doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "pyproject-hooks (!=1.1)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier", "towncrier (<24.7)"]
test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "jaraco.test (>=5.5)", "packaging (>=23.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-home (>=0.5)", "pytest-perf", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel (>=0.44.0)"]
test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "jaraco.test (>=5.5)", "packaging (>=24.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-home (>=0.5)", "pytest-perf", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel (>=0.44.0)"]
@@ -2471,13 +2568,13 @@ test = ["cython (>=3.0)", "defusedxml (>=0.7.1)", "pytest (>=8.0)", "setuptools
@@ -2638,13 +2735,43 @@ tests = ["cython", "littleutils", "pygments", "pytest", "typeguard"]
@@ -2658,42 +2785,54 @@ files = [
@@ -2743,13 +2882,13 @@ zstd = ["zstandard (>=0.18.0)"]
@@ -2774,13 +2913,13 @@ files = [
@@ -2794,4 +2933,4 @@ type = ["pytest-mypy"]