Skip to content

Commit c285c4c

Browse files
authored
Merge pull request #414 from European-XFEL/missingDaskDeps
2 parents 0e4a054 + 8b49611 commit c285c4c

3 files changed

Lines changed: 22 additions & 11 deletions

File tree

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Install dependencies
3131
run: |
3232
python3 -m pip install --upgrade pip
33-
python3 -m pip install .[bridge,test] --constraint .github/dependabot/constraints.txt
33+
python3 -m pip install .[test] --constraint .github/dependabot/constraints.txt
3434
3535
- name: Test with pytest
3636
run: |

docs/index.rst

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,19 @@ EXtra-data is available on our Anaconda installation on the Maxwell cluster::
1212
module load exfel exfel_anaconda3
1313

1414
You can also install it `from PyPI <https://pypi.org/project/EXtra-data/>`__
15-
to use in other environments with Python 3.6 or later::
15+
to use in other environments with Python 3.7 or later::
1616

1717
pip install extra_data
1818

19+
This will install the `extra_data` package and the most commonly useful dependencies.
20+
Some large dependencies or dependencies only required for specific functionalities are
21+
not installed by default. You can use pip to install everything required for extra or
22+
all uses of `extra_data` (e.g. Dask Array, :ref:`cmd-serve-files`). This installs both
23+
`extra_data` and dependencies that are necessary::
24+
25+
pip install "extra_data[bridge]" # install dependencies for karabo-bridge-like data streaming
26+
pip install "extra_data[complete]" # install dependencies for all features
27+
1928
If you get a permissions error, add the ``--user`` flag to that command.
2029

2130
Quickstart

setup.py

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,36 +51,38 @@ def find_version(*parts):
5151
},
5252
install_requires=[
5353
'h5py>=2.10',
54+
'matplotlib',
5455
'numpy',
5556
'packaging',
5657
'pandas',
5758
'xarray',
58-
'matplotlib'
5959
],
6060
extras_require={
6161
'bridge': [
6262
'karabo-bridge >=0.6',
6363
'psutil',
6464
],
65+
'complete': [
66+
'dask[array]',
67+
'extra_data[bridge]',
68+
'pyyaml',
69+
'tomli; python_version < "3.11"',
70+
],
6571
'docs': [
66-
'sphinx',
67-
'nbsphinx',
72+
'extra_data[bridge]', # For autodoc of ZMQStreamer
6873
'ipython', # For nbsphinx syntax highlighting
74+
'nbsphinx',
75+
'sphinx',
6976
'sphinxcontrib_github_alt',
70-
'karabo-bridge', # For autodoc of ZMQStreamer
71-
'psutil',
7277
],
7378
'test': [
7479
'cloudpickle',
7580
'coverage',
76-
'dask[array]',
81+
'extra_data[complete]',
7782
'nbval',
7883
'pytest',
7984
'pytest-cov',
8085
'testpath',
81-
'psutil',
82-
'pyyaml',
83-
'tomli; python_version < "3.11"'
8486
]
8587
},
8688
python_requires='>=3.6',

0 commit comments

Comments
 (0)