Merge remote-tracking branch 'upstream/main' into black

# Conflicts:
#	rsciio/exceptions.py
#	rsciio/sur/api.py

rsciio/__init__.py

@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
-# Copyright 2007-2016 The HyperSpy developers
+# Copyright 2007-2022 The HyperSpy developers
 #
-# This file is part of  HyperSpy.
+# This file is part of RosettaSciIO.
 #
-#  HyperSpy is free software: you can redistribute it and/or modify
+# RosettaSciIO is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-#  HyperSpy is distributed in the hope that it will be useful,
+# RosettaSciIO is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with  HyperSpy.  If not, see <https://www.gnu.org/licenses/>.
+# along with RosettaSciIO. If not, see <https://www.gnu.org/licenses/#GPL>.
 
 import logging
 import yaml

rsciio/_hierarchical.py

@@ -1,3 +1,21 @@
+# -*- coding: utf-8 -*-
+# Copyright 2007-2022 The HyperSpy developers
+#
+# This file is part of RosettaSciIO.
+#
+# RosettaSciIO is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# RosettaSciIO is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with RosettaSciIO. If not, see <https://www.gnu.org/licenses/#GPL>.
+
 import ast
 import datetime
 import logging

rsciio/blockfile/api.py

@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 # Copyright 2007-2022 The HyperSpy developers
 #
-# This file is part of HyperSpy.
+# This file is part of RosettaSciIO.
 #
-# HyperSpy is free software: you can redistribute it and/or modify
+# RosettaSciIO is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# HyperSpy is distributed in the hope that it will be useful,
+# RosettaSciIO is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with HyperSpy. If not, see <https://www.gnu.org/licenses/#GPL>.
+# along with RosettaSciIO. If not, see <https://www.gnu.org/licenses/#GPL>.
 
 import os
 import logging

rsciio/dens/api.py

@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 # Copyright 2007-2022 The HyperSpy developers
 #
-# This file is part of HyperSpy.
+# This file is part of RosettaSciIO.
 #
-# HyperSpy is free software: you can redistribute it and/or modify
+# RosettaSciIO is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# HyperSpy is distributed in the hope that it will be useful,
+# RosettaSciIO is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with HyperSpy. If not, see <https://www.gnu.org/licenses/#GPL>.
+# along with RosettaSciIO. If not, see <https://www.gnu.org/licenses/#GPL>.
 
 
 import numpy as np

rsciio/digital_micrograph/api.py

@@ -1,22 +1,22 @@
 # -*- coding: utf-8 -*-
 # Copyright 2010 Stefano Mazzucco
-# Copyright 2011-2020 The HyperSpy developers
+# Copyright 2011-2022 The HyperSpy developers
 #
-# This file is part of HyperSpy. It is a fork of the original PIL dm3 plugin
+# This file is part of RosettaSciIO. It is a fork of the original PIL dm3 plugin
 # written by Stefano Mazzucco.
 #
-# HyperSpy is free software: you can redistribute it and/or modify
+# RosettaSciIO is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# HyperSpy is distributed in the hope that it will be useful,
+# RosettaSciIO is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with HyperSpy. If not, see <https://www.gnu.org/licenses/#GPL>.
+# along with RosettaSciIO. If not, see <https://www.gnu.org/licenses/#GPL>.
 
 # Plugin to read the Gatan Digital Micrograph(TM) file format
 

rsciio/edax/api.py

@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 # Copyright 2007-2022 The HyperSpy developers
 #
-# This file is part of HyperSpy.
+# This file is part of RosettaSciIO.
 #
-# HyperSpy is free software: you can redistribute it and/or modify
+# RosettaSciIO is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# HyperSpy is distributed in the hope that it will be useful,
+# RosettaSciIO is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with HyperSpy. If not, see <https://www.gnu.org/licenses/#GPL>.
+# along with RosettaSciIO. If not, see <https://www.gnu.org/licenses/#GPL>.
 
 # The details of the format were taken from
 # https://www.biochem.mpg.de/doc_tom/TOM_Release_2008/IOfun/tom_mrcread.html

rsciio/emd/api.py

@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 # Copyright 2007-2022 The HyperSpy developers
 #
-# This file is part of HyperSpy.
+# This file is part of RosettaSciIO.
 #
-# HyperSpy is free software: you can redistribute it and/or modify
+# RosettaSciIO is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# HyperSpy is distributed in the hope that it will be useful,
+# RosettaSciIO is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with HyperSpy. If not, see <https://www.gnu.org/licenses/#GPL>.
+# along with RosettaSciIO. If not, see <https://www.gnu.org/licenses/#GPL>.
 
 # The EMD format is a hdf5 standard proposed at Lawrence Berkeley
 # National Lab (see https://emdatasets.com/ for more information).

rsciio/empad/api.py

@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 # Copyright 2007-2022 The HyperSpy developers
 #
-# This file is part of HyperSpy.
+# This file is part of RosettaSciIO.
 #
-# HyperSpy is free software: you can redistribute it and/or modify
+# RosettaSciIO is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# HyperSpy is distributed in the hope that it will be useful,
+# RosettaSciIO is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with HyperSpy. If not, see <https://www.gnu.org/licenses/#GPL>.
+# along with RosettaSciIO. If not, see <https://www.gnu.org/licenses/#GPL>.
 
 import os
 import ast

rsciio/exceptions.py

@@ -1,3 +1,22 @@
+# -*- coding: utf-8 -*-
+# Copyright 2007-2022 The HyperSpy developers
+#
+# This file is part of RosettaSciIO.
+#
+# RosettaSciIO is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# RosettaSciIO is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with RosettaSciIO. If not, see <https://www.gnu.org/licenses/#GPL>.
+
+
 class MountainsMapFileError(Exception):
     def __init__(self, msg="Corrupt Mountainsmap file"):
         self.error = msg

rsciio/fei/api.py

@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 # Copyright 2007-2022 The HyperSpy developers
 #
-# This file is part of HyperSpy.
+# This file is part of RosettaSciIO.
 #
-# HyperSpy is free software: you can redistribute it and/or modify
+# RosettaSciIO is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# HyperSpy is distributed in the hope that it will be useful,
+# RosettaSciIO is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with HyperSpy. If not, see <https://www.gnu.org/licenses/#GPL>.
+# along with RosettaSciIO. If not, see <https://www.gnu.org/licenses/#GPL>.
 
 import struct
 import warnings

rsciio/hspy/api.py

@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 # Copyright 2007-2022 The HyperSpy developers
 #
-# This file is part of HyperSpy.
+# This file is part of RosettaSciIO.
 #
-# HyperSpy is free software: you can redistribute it and/or modify
+# RosettaSciIO is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# HyperSpy is distributed in the hope that it will be useful,
+# RosettaSciIO is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with HyperSpy. If not, see <https://www.gnu.org/licenses/#GPL>.
+# along with RosettaSciIO. If not, see <https://www.gnu.org/licenses/#GPL>.
 
 import logging
 from packaging.version import Version

rsciio/image/api.py

@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 # Copyright 2007-2022 The HyperSpy developers
 #
-# This file is part of HyperSpy.
+# This file is part of RosettaSciIO.
 #
-# HyperSpy is free software: you can redistribute it and/or modify
+# RosettaSciIO is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# HyperSpy is distributed in the hope that it will be useful,
+# RosettaSciIO is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with HyperSpy. If not, see <https://www.gnu.org/licenses/#GPL>.
+# along with RosettaSciIO. If not, see <https://www.gnu.org/licenses/#GPL>.
 
 import os
 import logging

rsciio/jeol/api.py

@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 # Copyright 2007-2022 The HyperSpy developers
 #
-# This file is part of HyperSpy.
+# This file is part of RosettaSciIO.
 #
-# HyperSpy is free software: you can redistribute it and/or modify
+# RosettaSciIO is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# HyperSpy is distributed in the hope that it will be useful,
+# RosettaSciIO is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with HyperSpy. If not, see <https://www.gnu.org/licenses/#GPL>.
+# along with RosettaSciIO. If not, see <https://www.gnu.org/licenses/#GPL>.
 
 import os
 from collections.abc import Iterable

rsciio/mrc/api.py

@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 # Copyright 2007-2022 The HyperSpy developers
 #
-# This file is part of HyperSpy.
+# This file is part of RosettaSciIO.
 #
-# HyperSpy is free software: you can redistribute it and/or modify
+# RosettaSciIO is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# HyperSpy is distributed in the hope that it will be useful,
+# RosettaSciIO is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with HyperSpy. If not, see <https://www.gnu.org/licenses/#GPL>.
+# along with RosettaSciIO. If not, see <https://www.gnu.org/licenses/#GPL>.
 
 # The details of the format were taken from
 # https://www.biochem.mpg.de/doc_tom/TOM_Release_2008/IOfun/tom_mrcread.html

rsciio/mrcz/api.py

@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 # Copyright 2007-2022 The HyperSpy developers
 #
-# This file is part of HyperSpy.
+# This file is part of RosettaSciIO.
 #
-# HyperSpy is free software: you can redistribute it and/or modify
+# RosettaSciIO is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# HyperSpy is distributed in the hope that it will be useful,
+# RosettaSciIO is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with HyperSpy. If not, see <https://www.gnu.org/licenses/#GPL>.
+# along with RosettaSciIO. If not, see <https://www.gnu.org/licenses/#GPL>.
 
 from packaging.version import Version
 import mrcz as _mrcz

rsciio/msa/api.py

@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 # Copyright 2007-2022 The HyperSpy developers
 #
-# This file is part of HyperSpy.
+# This file is part of RosettaSciIO.
 #
-# HyperSpy is free software: you can redistribute it and/or modify
+# RosettaSciIO is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# HyperSpy is distributed in the hope that it will be useful,
+# RosettaSciIO is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with HyperSpy. If not, see <https://www.gnu.org/licenses/#GPL>.
+# along with RosettaSciIO. If not, see <https://www.gnu.org/licenses/#GPL>.
 
 from datetime import datetime as dt
 import codecs