Merge pull request #5 from dnjohnstone/master

tidy up

diffsims/__init__.py

@@ -29,20 +29,3 @@
 from .sims.diffraction_simulation import DiffractionSimulation
 
 _logger = logging.getLogger(__name__)
-
-
-def load(filename):
-    """
-    An extremely thin wrapper around hyperspy's load function
-
-    Parameters
-    ----------
-    filename : str
-        A single filename of a previously saved diffsims object. Other arguments may
-        succeed, but will have fallen back on hyperspy load and warn accordingly
-    *args :
-        args to be passed to hyperspy's load function
-    **kwargs :
-        kwargs to be passed to hyperspy's load function
-    """
-    pass

diffsims/generators/diffraction_generator.py

@@ -173,7 +173,7 @@ def calculate_profile_data(self, structure,
 
         Returns
         -------
-        pyxem.ProfileSimulation
+        diffsims.ProfileSimulation
             The diffraction profile corresponding to this structure and
             experimental conditions.
         """

diffsims/tests/test_generators/test_diffraction_generator.py

@@ -126,4 +126,4 @@ def test_param_check(scattering_param):
 def test_invalid_scattering_params():
     scattering_param = '_empty'
     generator = DiffractionGenerator(300, 0.2, None,
-scattering_params=scattering_param)
+                                     scattering_params=scattering_param)

diffsims/tests/test_sims/test_diffraction_simulation.py

@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
-# Copyright 2017-2019 The pyXem developers
+# Copyright 2017-2019 The diffsims developers
 #
-# This file is part of pyXem.
+# This file is part of diffsims.
 #
-# pyXem is free software: you can redistribute it and/or modify
+# diffsims 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.
 #
-# pyXem is distributed in the hope that it will be useful,
+# diffsims 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 pyXem.  If not, see <http://www.gnu.org/licenses/>.
+# along with diffsims.  If not, see <http://www.gnu.org/licenses/>.
 
 import numpy as np
 import pytest

diffsims/tests/test_utils/test_vector_utils.py

@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
-# Copyright 2019 The pyXem developers
+# Copyright 2019 The diffsims developers
 #
-# This file is part of pyXem.
+# This file is part of diffsims.
 #
-# pyXem is free software: you can redistribute it and/or modify
+# diffsims 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.
 #
-# pyXem is distributed in the hope that it will be useful,
+# diffsims 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 pyXem.  If not, see <http://www.gnu.org/licenses/>.
+# along with diffsims.  If not, see <http://www.gnu.org/licenses/>.
 
 import numpy as np
 import pytest

setup.py

@@ -46,8 +46,8 @@
     packages=find_packages(),
     # adjust the tabbing
     install_requires=[
-        'scikit-image == 0.15.0',  # See pyxem/pull/378
-        'matplotlib < 3.1.0',  # See pyxem/pull/403
+        'scikit-image == 0.15.0',
+        'matplotlib < 3.1.0',
         'transforms3d',
         'diffpy.structure >= 3.0.0'  # First Python 3 support
     ],