Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split IO #2 #2972

Merged
merged 132 commits into from Jul 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
132 commits
Select commit Hold shift + click to select a range
1662bd9
Move io_plugins to new package folder rosettascio
francisco-dlp Jun 22, 2022
ad77a01
Add setup, license and README
francisco-dlp Jun 22, 2022
2b44518
Update imports
francisco-dlp Jun 22, 2022
0ebdd49
Move io tests to rsciio
francisco-dlp Jun 22, 2022
2c076d1
Fix import
francisco-dlp Jun 22, 2022
543b0ee
Add untracked zip folder
francisco-dlp Jun 22, 2022
66489be
Move each plugin to each own folder and rename all to api.py
francisco-dlp Jun 22, 2022
c323a45
Add __init__.py
francisco-dlp Jun 22, 2022
909a2ab
Move io specifications to yaml file
francisco-dlp Jun 22, 2022
58a5563
Use yaml files to create IO_PLUGINS list
francisco-dlp Jun 22, 2022
8f60e7a
Use yaml files to create IO_PLUGINS list
francisco-dlp Jun 30, 2022
50e57f0
Remove IO from setup.py
francisco-dlp Jun 30, 2022
c73f80b
Some fixes
francisco-dlp Jun 30, 2022
b611c2b
test_io passing
francisco-dlp Jun 30, 2022
3321707
Fix some issues
francisco-dlp Jul 1, 2022
8302dbe
Raise an error when multiple readers can read a file
francisco-dlp Jul 1, 2022
cf2d425
Add file_format keyword to save and raise error when multiple formats…
francisco-dlp Jul 1, 2022
6dd19ad
Fix test_hdf5
francisco-dlp Jul 1, 2022
5cc1df1
Fix tiff tests
francisco-dlp Jul 1, 2022
8939adb
Fix USID
francisco-dlp Jul 1, 2022
f5cb0ec
Fix ZSPY
francisco-dlp Jul 1, 2022
bf7fe23
Fix saving when multiple file_formats possible
francisco-dlp Jul 1, 2022
9e9c45b
Fix cython bruker
francisco-dlp Jul 2, 2022
3fa3e28
Move hyperspy/misc/io to rsciio/utils
francisco-dlp Jul 4, 2022
d0cf6e3
Replace DictionaryTreeBrowser with python-box in DM reader
francisco-dlp Jul 4, 2022
e7bd2e0
Replace DictionaryTreeBrowser with python-box in MSA reader
francisco-dlp Jul 5, 2022
3947ac0
Replace DictionaryTreeBrowser with python-box in FEI reader
francisco-dlp Jul 5, 2022
8e82b8a
Replace DictionaryTreeBrowser with python-box in EMPAD reader
francisco-dlp Jul 5, 2022
49e2a1d
Replace DictionaryTreeBrowser with python-box in ripple reader
francisco-dlp Jul 5, 2022
21c48fa
Move IO exceptions to rsciio
francisco-dlp Jul 5, 2022
a6e7aca
Move IO exceptions to rsciio
francisco-dlp Jul 5, 2022
bbe3805
Remove hyperspy import from mrcz
francisco-dlp Jul 5, 2022
e61b92b
Remove hyperspy dependency from semper reader
francisco-dlp Jul 5, 2022
2b99410
Merge branch 'SPLIT_IO-2' of https://github.com/francisco-dlp/hypersp…
francisco-dlp Jul 5, 2022
5e1220f
Move sarray2dict and dict2sarray to rsciio
francisco-dlp Jul 6, 2022
0dae98c
Move some dateutil functions to rsciio
francisco-dlp Jul 6, 2022
06055e8
Fix nexus hyperspy import
francisco-dlp Jul 6, 2022
50a0b1b
Fix bruker unbcf_fast import
francisco-dlp Jul 6, 2022
9f372bc
Add dummy_context_manager to rsciio
francisco-dlp Jul 6, 2022
9e3b452
Add missing files
francisco-dlp Jul 6, 2022
621ee3d
Remove hspy deprecation_warning from bruker
francisco-dlp Jul 6, 2022
a1db743
Remove hspy optimize_arg from DM
francisco-dlp Jul 6, 2022
b6dcb2b
Add elements to rsciio
francisco-dlp Jul 6, 2022
24652d6
Fix CI
ericpre Jul 6, 2022
a41289a
Fix and tidy up setup.py
ericpre Jul 6, 2022
2cb899c
Fix import
ericpre Jul 6, 2022
7d58182
Fix test
ericpre Jul 6, 2022
4143a69
Fix test with reader inference for hdf5 file
ericpre Jul 6, 2022
89ee1ea
Merge pull request #48 from ericpre/SPLIT_IO-2_fix_test_suite
francisco-dlp Jul 7, 2022
a878e1f
Import ureg from rsciio
francisco-dlp Jul 7, 2022
1d69768
Merge branch 'SPLIT_IO-2' of https://github.com/francisco-dlp/hypersp…
francisco-dlp Jul 7, 2022
c5d5177
Add package version
francisco-dlp Jul 7, 2022
2d93734
Replace hyperspy version with rsciio version
francisco-dlp Jul 7, 2022
e87bac2
Remove strong dependency from hyperspy.mist.rgb_tools
francisco-dlp Jul 8, 2022
f4b41dc
EMD no longer requires HyperSpy for reading files
francisco-dlp Jul 8, 2022
cbde49b
Pass dictionary instead of Signal to file_writer
francisco-dlp Jul 8, 2022
928fd80
Make MSA file writer work with dictionary
francisco-dlp Jul 8, 2022
553c19c
Updated the file_reader docstring to include reading of 'de5' files.
TomSlater Jul 29, 2021
674b3e8
Add de5 to io.rst
TomSlater Jul 29, 2021
2b7a9d8
Add test for de5 io plugin
ericpre Jul 8, 2022
7cecda7
Make USID_HDF5 file writer work with dictionary
ericpre Jul 9, 2022
1c5ab93
Move date_time_tools to rsciio
ericpre Jul 9, 2022
e4dbea2
Make tiff writer work with dictionary
ericpre Jul 9, 2022
93aa9eb
Make nexus writer work with dictionary
ericpre Jul 9, 2022
83fe3ed
Make ripple writer work with dictionary
ericpre Jul 9, 2022
87cb93b
Make mrcz writer work with dictionary
ericpre Jul 9, 2022
5095bdd
Make image writer work with dictionary
ericpre Jul 9, 2022
14e0cc4
Merge pull request #49 from ericpre/de5_file
francisco-dlp Jul 11, 2022
a80a533
Merge pull request #51 from ericpre/rsciio_hs_free_write_usid
francisco-dlp Jul 11, 2022
1325c5d
Fix tvips (was not writing in hyperspy) and make it take dict
francisco-dlp Jul 12, 2022
6b08d59
Make semper writer it take dict
francisco-dlp Jul 12, 2022
6021ac1
Add io_plugin for CEOS Panta Rhei *.prz file format
Feb 25, 2022
13b509d
Add relevant docstrings to public functions
Mar 9, 2022
a2ff3d8
Add changelog entry
Mar 10, 2022
ce3600d
Add test for PRZ file reader
May 30, 2022
d806122
Add user documentation of PRZ file support.
May 31, 2022
95fbb6c
Update test for PRZ file reader.
May 31, 2022
2a620a5
Improve coverage and add test save, load cycle
ericpre Jul 8, 2022
e57b278
Move CEOS prz io plugins to rsciio
ericpre Jul 12, 2022
4451795
Merge pull request #52 from ericpre/SPLIT_IO-2-panta_rhei_io_plugin
francisco-dlp Jul 13, 2022
538d0e2
Make blockfile writer take dict
francisco-dlp Jul 13, 2022
1716c9a
Merge remote-tracking branch 'francisco/SPLIT_IO-2' into rsciio_hs_fr…
francisco-dlp Jul 13, 2022
aa594fb
Make EMD writer take dict
francisco-dlp Jul 13, 2022
fce3912
Make panta rhei writer take dict
francisco-dlp Jul 13, 2022
4eea690
Move ensure_unicode to rsciio and copy get_obj to rsciio
francisco-dlp Jul 13, 2022
fecb4b8
_hierarchical does not require hyperspy for reading
francisco-dlp Jul 14, 2022
eac6b3e
Make hspy/zspy independent of HyperSpy
francisco-dlp Jul 14, 2022
3b1e833
Fix storing AxesManager in dict
francisco-dlp Jul 15, 2022
6568638
Update skimage version requirement
francisco-dlp Jul 15, 2022
b49d2ab
Remove unnecessary import
francisco-dlp Jul 15, 2022
b3edf13
Move docs to RosettaSciIO
ericpre Jul 13, 2022
6952248
Improve structure toctree
ericpre Jul 13, 2022
c026a1a
add .gitignore
ericpre Jul 13, 2022
e27b400
Merge pull request #53 from ericpre/SPLIT_IO-docs
francisco-dlp Jul 15, 2022
e8cacae
Remove traits dependence
ericpre Jul 18, 2022
b51894d
Remove traits dependence, 2nd pass
ericpre Jul 18, 2022
75dcc64
fix doc references
jlaehne Jul 19, 2022
d844112
introductory paragraph
jlaehne Jul 19, 2022
114b5dc
fixes
jlaehne Jul 19, 2022
f4ad078
supported formats intro
jlaehne Jul 19, 2022
b1d74f7
references in CHANGES.rst
jlaehne Jul 19, 2022
851158e
sort supported formats, add extension
jlaehne Jul 19, 2022
f7d2e15
link supported formats
jlaehne Jul 19, 2022
f0d92c9
Merge pull request #54 from ericpre/SPLIT_IO-remove_traits_dependence
francisco-dlp Jul 19, 2022
cc80096
consistency, format titles
jlaehne Jul 19, 2022
ed6715f
consistency semper
jlaehne Jul 19, 2022
5b54e76
replace HyperSpy mentions where appropriate
jlaehne Jul 19, 2022
e559740
update interoperability
jlaehne Jul 19, 2022
7f276a0
fixes
jlaehne Jul 19, 2022
49e3b23
typos interoperability
jlaehne Jul 20, 2022
1b61601
update hyperspy docs
jlaehne Jul 20, 2022
eeb6fa4
update issue tracker links
jlaehne Jul 20, 2022
5c0eb21
fix
jlaehne Jul 20, 2022
55f1f2a
add note to dev-guide
jlaehne Jul 20, 2022
fa3df00
pass not needed
jlaehne Jul 20, 2022
fa44eac
unneccesary imports
jlaehne Jul 20, 2022
6e7c092
unneccesary assignment
jlaehne Jul 20, 2022
82b7ac4
fix tiff
jlaehne Jul 20, 2022
8a72ec8
Merge branch 'SPLIT_IO-2' into rsciio-lgtm
jlaehne Jul 20, 2022
9b5396a
Merge pull request #55 from jlaehne/rosetta-doc-test
francisco-dlp Jul 21, 2022
815afc1
Merge pull request #56 from jlaehne/rsciio-lgtm
francisco-dlp Jul 21, 2022
f49f930
mention RosettaSciIO in getting_started
jlaehne Jul 21, 2022
d3d9cc2
Merge pull request #57 from jlaehne/rsciio-link
francisco-dlp Jul 21, 2022
65c6bd7
Remove folder from rosettascio to rosettasciio
ericpre Jul 21, 2022
df05475
Move rgbtools to rosettasciio
ericpre Jul 21, 2022
47898c6
Fix package name "RosettaSciIO"
ericpre Jul 21, 2022
6b6c4cf
Remove traits dependency
ericpre Jul 21, 2022
e693927
Add test for `_obj_in_dict2hspy`
ericpre Jul 21, 2022
ce5f9b9
Update tests.yml
jlaehne Jul 21, 2022
7958291
Update azure-pipelines.yml
jlaehne Jul 21, 2022
a2e62c9
Merge pull request #22 from jlaehne/patch-1
ericpre Jul 21, 2022
a99009b
Merge pull request #58 from ericpre/SPLIT_IO-2_final
francisco-dlp Jul 22, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 9 additions & 0 deletions .github/workflows/tests.yml
Expand Up @@ -73,6 +73,11 @@ jobs:
run: |
pip install ${{ env.PIP_ARGS }} .'${{ matrix.PIP_SELECTOR }}'

- name: Install rosettasciio
shell: bash
run: |
pip install -e ./rosettasciio

- name: Pip list
run: |
pip list
Expand All @@ -81,6 +86,10 @@ jobs:
run: |
pytest ${{ env.PYTEST_ARGS }} ${{ matrix.PYTEST_ARGS_COVERAGE }}

- name: Run test suite (rosettasciio)
run: |
pytest --pyargs rosettasciio

- name: Upload coverage to Codecov
if: ${{ always() }} && ${{ matrix.PYTEST_ARGS_COVERAGE }}
uses: codecov/codecov-action@v2
Expand Down
56 changes: 28 additions & 28 deletions CHANGES.rst
Expand Up @@ -20,14 +20,14 @@ New features
- Support for :ref:`relative slicing <signal.indexing>` (`#2386 <https://github.com/hyperspy/hyperspy/issues/2386>`_)
- Implement non-uniform axes, not all hyperspy functionalities support non-uniform axes, see this `tracking issue <https://github.com/hyperspy/hyperspy/issues/2398>`_ for progress. (`#2399 <https://github.com/hyperspy/hyperspy/issues/2399>`_)
- Add (weighted) :ref:`linear least square fitting <linear_fitting-label>`. Close `#488 <https://github.com/hyperspy/hyperspy/issues/488>`_ and `#574 <https://github.com/hyperspy/hyperspy/issues/574>`_. (`#2422 <https://github.com/hyperspy/hyperspy/issues/2422>`_)
- Support for reading :ref:`JEOL EDS data<jeol_format-label>` (`#2488 <https://github.com/hyperspy/hyperspy/issues/2488>`_)
- Support for reading :external+rsciio:ref:`JEOL EDS data<jeol-format>` (`#2488 <https://github.com/hyperspy/hyperspy/issues/2488>`_)
- Plot overlayed images - see :ref:`plotting several images<plot.images>` (`#2599 <https://github.com/hyperspy/hyperspy/issues/2599>`_)
- Add initial support for :ref:`GPU computation<gpu_processing>` using cupy (`#2670 <https://github.com/hyperspy/hyperspy/issues/2670>`_)
- Add ``height`` property to the :py:class:`~._components.gaussian2d.Gaussian2D` component (`#2688 <https://github.com/hyperspy/hyperspy/issues/2688>`_)
- Support for reading and writing :ref:`TVIPS image stream data<tvips_format-label>` (`#2780 <https://github.com/hyperspy/hyperspy/issues/2780>`_)
- Add in :ref:`zspy format<zspy-format>`: hspy specification with the zarr format. Particularly useful to speed up loading and :ref:`saving large datasets<big_data.saving>` by using concurrency. (`#2825 <https://github.com/hyperspy/hyperspy/issues/2825>`_)
- Support for reading :ref:`DENSsolutions Impulse data<dens-format>` (`#2828 <https://github.com/hyperspy/hyperspy/issues/2828>`_)
- Add lazy loading for :ref:`JEOL EDS data<jeol_format-label>` (`#2846 <https://github.com/hyperspy/hyperspy/issues/2846>`_)
- Support for reading and writing :external+rsciio:ref:`TVIPS image stream data<tvips-format>` (`#2780 <https://github.com/hyperspy/hyperspy/issues/2780>`_)
- Add in :external+rsciio:ref:`zspy format<zspy-format>`: hspy specification with the zarr format. Particularly useful to speed up loading and :ref:`saving large datasets<big_data.saving>` by using concurrency. (`#2825 <https://github.com/hyperspy/hyperspy/issues/2825>`_)
- Support for reading :external+rsciio:ref:`DENSsolutions Impulse data<dens-format>` (`#2828 <https://github.com/hyperspy/hyperspy/issues/2828>`_)
- Add lazy loading for :external+rsciio:ref:`JEOL EDS data<jeol-format>` (`#2846 <https://github.com/hyperspy/hyperspy/issues/2846>`_)
- Add :ref:`html representation<lazy._repr_html_>` for lazy signals and the
:py:meth:`~._signals.lazy.LazySignal.get_chunk_size` method to get the chunk size
of given axes (`#2855 <https://github.com/hyperspy/hyperspy/issues/2855>`_)
Expand Down Expand Up @@ -69,11 +69,11 @@ Enhancements
- Read cathodoluminescence metadata from digital micrograph files, amended in `PR #2894 <https://github.com/hyperspy/hyperspy/pull/2894>`_ (`#2590 <https://github.com/hyperspy/hyperspy/issues/2590>`_)
- Add possibility to search/access nested items in DictionaryTreeBrowser (metadata) without providing full path to item. (`#2633 <https://github.com/hyperspy/hyperspy/issues/2633>`_)
- Improve :py:meth:`~.signal.BaseSignal.map` function in :py:class:`~.signal.BaseSignal` by utilizing dask for both lazy and non-lazy signals. This includes adding a `lazy_output` parameter, meaning non-lazy signals now can output lazy results. See the :ref:`user guide<lazy_output-map-label>` for more information. (`#2703 <https://github.com/hyperspy/hyperspy/issues/2703>`_)
- :ref:`NeXus<nexus-format>` file with more options when reading and writing (`#2725 <https://github.com/hyperspy/hyperspy/issues/2725>`_)
- :external+rsciio:ref:`NeXus<nexus-format>` file with more options when reading and writing (`#2725 <https://github.com/hyperspy/hyperspy/issues/2725>`_)
- Add ``dtype`` argument to :py:meth:`~.signal.BaseSignal.rebin` (`#2764 <https://github.com/hyperspy/hyperspy/issues/2764>`_)
- Add option to set output size when :ref:`exporting images<image-format>` (`#2791 <https://github.com/hyperspy/hyperspy/issues/2791>`_)
- Add option to set output size when :external+rsciio:ref:`exporting images<image-format>` (`#2791 <https://github.com/hyperspy/hyperspy/issues/2791>`_)
- Add :py:meth:`~.axes.AxesManager.switch_iterpath` context manager to switch iterpath (`#2795 <https://github.com/hyperspy/hyperspy/issues/2795>`_)
- Add options not to close file (lazy signal only) and not to write dataset for hspy file format, see :ref:`hspy-format` for details (`#2797 <https://github.com/hyperspy/hyperspy/issues/2797>`_)
- Add options not to close file (lazy signal only) and not to write dataset for hspy file format, see :external+rsciio:ref:`hspy-format` for details (`#2797 <https://github.com/hyperspy/hyperspy/issues/2797>`_)
- Add Github workflow to run test suite of extension from a pull request. (`#2824 <https://github.com/hyperspy/hyperspy/issues/2824>`_)
- Add :py:attr:`~.signal.BaseSignal.ragged` attribute to :py:class:`~.signal.BaseSignal` to clarify when a signal contains a ragged array. Fix inconsistency caused by ragged array and add a :ref:`ragged array<signal.ragged>` section to the user guide (`#2842 <https://github.com/hyperspy/hyperspy/issues/2842>`_)
- Import hyperspy submodules lazily to speed up importing hyperspy. Fix autocompletion `signals` submodule (`#2850 <https://github.com/hyperspy/hyperspy/issues/2850>`_)
Expand Down Expand Up @@ -292,12 +292,12 @@ NEW

* Support for the following file formats:

* :ref:`sur-format`
* :ref:`elid_format-label`
* :ref:`nexus-format`
* :ref:`usid-format`
* :ref:`empad-format`
* Prismatic EMD format, see :ref:`emd-format`
* :external+rsciio:ref:`sur-format`
* :external+rsciio:ref:`elid-format`
* :external+rsciio:ref:`nexus-format`
* :external+rsciio:ref:`usid-format`
* :external+rsciio:ref:`empad-format`
* Prismatic EMD format, see :external+rsciio:ref:`emd-format`
* :meth:`~._signals.eels.EELSSpectrum.print_edges_near_energy` method
that, if the `hyperspy-gui-ipywidgets package
<https://github.com/hyperspy/hyperspy_gui_ipywidgets>`_
Expand Down Expand Up @@ -574,9 +574,9 @@ NEW

* Support for three new file formats:

* Reading FEI's Velox EMD file format based on the HDF5 open standard. See :ref:`emd_fei-format`.
* Reading Bruker's SPX format. See :ref:`spx-format`.
* Reading and writing the mrcz open format. See :ref:`mrcz-format`.
* Reading FEI's Velox EMD file format based on the HDF5 open standard. See :external+rsciio:ref:`emd_fei-format`.
* Reading Bruker's SPX format. See :external+rsciio:ref:`spx-format`.
* Reading and writing the mrcz open format. See :external+rsciio:ref:`mrcz-format`.
* New :mod:`~.datasets.artificial_data` module which contains functions for generating
artificial data, for use in things like docstrings or for people to test
HyperSpy functionalities. See :ref:`example-data-label`.
Expand Down Expand Up @@ -665,7 +665,7 @@ Enhancements
------------
* Creating many markers is now much faster.
* New "Stage" metadata node. See :ref:`metadata_structure` for details.
* The Brucker file reader now supports the new version of the format. See :ref:`bcf-format`.
* The Brucker file reader now supports the new version of the format. See :external+rsciio:ref:`bcf-format`.
* HyperSpy is now compatible with all matplotlib backends, including the nbagg which is
particularly convenient for interactive data analysis in the
`Jupyter Notebook <http://jupyter.org>`__ in combination with the new
Expand Down Expand Up @@ -702,7 +702,7 @@ API changes
* :py:meth:`~.signal.MVATools.plot_decomposition_factors`.

* The default extension when saving to HDF5 following HyperSpy's specification
is now ``hspy`` instead of ``hdf5``. See :ref:`hspy-format`.
is now ``hspy`` instead of ``hdf5``. See :external+rsciio:ref:`hspy-format`.

* The following methods are deprecated and will be removed in HyperSpy 2.0

Expand Down Expand Up @@ -765,7 +765,7 @@ NEW
it internally (a good fraction of HyperSpy's functionaly). See
:ref:`map-label`.
* :ref:`electron-holography-label` reconstruction.
* Support for reading :ref:`edax-format` files.
* Support for reading :external+rsciio:ref:`edax-format` files.
* New signal methods :py:meth:`~.signal.BaseSignal.indexmin` and
:py:meth:`~.signal.BaseSignal.valuemin`.

Expand All @@ -786,7 +786,7 @@ Enhancements
* Markers can now be saved to hdf5 and creating many markers is easier and
faster. See :ref:`plot.markers`.
* Add option to save to HDF5 file using the ".hspy" extension instead of
".hdf5". See :ref:`hspy-format`. This will be the default extension in
".hdf5". See :external+rsciio:ref:`hspy-format`. This will be the default extension in
HyperSpy 1.3.

For developers
Expand Down Expand Up @@ -842,7 +842,7 @@ NEW
---

* :ref:`signal.transpose`.
* :ref:`protochips-format` reader.
* :external+rsciio:ref:`protochips-format` reader.

Enhancements
------------
Expand Down Expand Up @@ -903,17 +903,17 @@ EDS
IO
^^
* Support for reading certain files without :ref:`loading them to memory <load_to_memory-label>`.
* :ref:`Bruker's composite file (bcf) <bcf-format>` reading support.
* :ref:`Electron Microscopy Datasets (EMD) <emd-format>` read and write support.
* :ref:`SEMPER unf <unf-format>` read and write support.
* :ref:`DENS heat log <dens-format>` read support.
* :ref:`NanoMegas blockfile <blockfile-format>` read and write support.
* :external+rsciio:ref:`Bruker's composite file (bcf) <bcf-format>` reading support.
* :external+rsciio:ref:`Electron Microscopy Datasets (EMD) <emd-format>` read and write support.
* :external+rsciio:ref:`SEMPER unf <unf-format>` read and write support.
* :external+rsciio:ref:`DENS heat log <dens-format>` read support.
* :external+rsciio:ref:`NanoMegas blockfile <blockfile-format>` read and write support.

Enhancements
------------
* More useful ``AxesManager`` repr string with html repr for Jupyter Notebook.
* Better progress bar (`tqdm <https://github.com/noamraph/tqdm>`__).
* Add support for :ref:`writing/reading scale and unit to tif files
* Add support for :external+rsciio:ref:`writing/reading scale and unit to tif files
<tiff-format>` to be read with ImageJ or DigitalMicrograph.

Documentation
Expand Down
11 changes: 11 additions & 0 deletions azure-pipelines.yml
Expand Up @@ -69,13 +69,24 @@ steps:
conda list
displayName: Install package

- bash: |
source activate $ENV_NAME
pip install -e ./rosettasciio
conda list
displayName: Install package (rosettasciio)

# Note we must use `-n 2` argument for pytest-xdist due to
# https://github.com/pytest-dev/pytest-xdist/issues/9.
- bash: |
source activate $ENV_NAME
pytest --mpl --pyargs hyperspy --reruns 3 --instafail --mpl-results-path $RESULT_IMAGES_FOLDER
displayName: Run test suite

- bash: |
source activate $ENV_NAME
pytest --pyargs rosettasciio --reruns 3 --instafail
displayName: Run test suite (rosettasciio)

- publish: $(System.DefaultWorkingDirectory)/$(RESULT_IMAGES_FOLDER)
artifact: $(Agent.JobName)-result_images
displayName: Publish Image Comparison
Expand Down
3 changes: 2 additions & 1 deletion doc/conf.py
Expand Up @@ -245,7 +245,8 @@


# Add the hyperspy website to the intersphinx domains
intersphinx_mapping = {'cupy': ('https://docs.cupy.dev/en/stable', None),
intersphinx_mapping = {'rsciio': ('https://hyperspy.org/rosettasciio/', None),
'cupy': ('https://docs.cupy.dev/en/stable', None),
'python': ('https://docs.python.org/3', None),
'h5py': ('https://docs.h5py.org/en/stable', None),
'hyperspyweb': ('https://hyperspy.org/', None),
Expand Down
10 changes: 10 additions & 0 deletions doc/dev_guide/intro.rst
Expand Up @@ -108,3 +108,13 @@ There are 3 key points to get right when starting out as a contributor:
3. Bear in mind that every new function you write will need
:ref:`tests <testing-label>` and
:ref:`user documentation <writing_documentation-label>`!

.. note::

The IO plugins formerly developed within HyperSpy have now been moved to
the separate `RosettaSciIO repository <https://github.com/hyperspy/rosettasciio>`_
in order to facilitate a wider use also by other packages. Plugins supporting
additional formats or corrections/enhancements to existing plugins should now
be contributed to the `RosettaSciIO repository <https://github.com/hyperspy/rosettasciio>`_
and file format specific issues should be reported to the `RosettaSciIO issue
tracker <https://github.com/hyperspy/rosettasciio/issues>`_.
11 changes: 6 additions & 5 deletions doc/user_guide/big_data.rst
Expand Up @@ -492,16 +492,17 @@ Other minor differences
.. _big_data.saving:

Saving Big Data
^^^^^^^^^^^^^^^^^
^^^^^^^^^^^^^^^

The most efficient format supported by HyperSpy to write data is the :ref:`zspy format <zspy-format>`,
mainly because it supports writing currently from concurrently from multiple threads or processes.
The most efficient format supported by HyperSpy to write data is the
:external+rsciio:py:ref:`ZSpy format <zspy-format>`,
mainly because it supports writing concurrently from multiple threads or processes.
This also allows for smooth interaction with dask-distributed for efficient scaling.

.. _lazy_details:

Behind the scenes --technical details
-------------------------------------
Behind the scenes -- technical details
--------------------------------------

Standard HyperSpy signals load the data into memory for fast access and
processing. While this behaviour gives good performance in terms of speed, it
Expand Down
4 changes: 2 additions & 2 deletions doc/user_guide/getting_started.rst
Expand Up @@ -159,8 +159,8 @@ working with HyperSpy/Python interactively.
Loading data
------------

Once HyperSpy is running, to load from a supported file format (see
:ref:`supported-formats`) simply type:
Once HyperSpy is running, to load from a :external+rsciio:ref:`file format
supported by RosettaSciIO <supported-formats>`, simply type:

.. code-block:: python

Expand Down