Merge 5aba312 into d4b890a

pyxem · Oct 9, 2020 · ffcbf0d · ffcbf0d
2 parents d4b890a + 5aba312
commit ffcbf0d
Show file tree

Hide file tree

Showing 17 changed files with 636 additions and 631 deletions.
diff --git a/CODE_OF_CONDUCT.md → .github/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md → .github/CODE_OF_CONDUCT.md
diff --git a/CONTRIBUTING.rst → .github/CONTRIBUTING.rst b/CONTRIBUTING.rst → .github/CONTRIBUTING.rst
diff --git a/PULL_REQUEST_TEMPLATE.md → .github/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md → .github/PULL_REQUEST_TEMPLATE.md
diff --git a/.travis.yml b/.travis.yml
@@ -15,10 +15,6 @@ matrix:
     env: export PYTHON=3.7
     before_install: wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
 
-  - name: "Python 3.6 on Linux"
-    env: export PYTHON=3.6
-    before_install: wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
-
   - name: "Python 3.7 on MacOS"
     os: osx
     env: export PYTHON=3.7

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- get_grid_beam_directions, now works of meshes
+
 ### Added
+- New module: "sphere_mesh_generators"
 - This project now keeps a Changelog
-### Fixed
-- get_grid_beam_directions previously gave incorrect grids
+
+### Removed
+- Python 3.6 testing
diff --git a/diffsims/crystallography/reciprocal_lattice_point.py b/diffsims/crystallography/reciprocal_lattice_point.py
@@ -247,10 +247,7 @@ def unique(self, use_symmetry=True):
         return self.__class__(phase=self.phase, hkl=unique_hkl)
 
     def symmetrise(
-        self,
-        antipodal=True,
-        unique=True,
-        return_multiplicity=False,
+        self, antipodal=True, unique=True, return_multiplicity=False,
     ):
         """Return planes with symmetrically equivalent Miller indices.
 
@@ -333,16 +330,11 @@ def calculate_structure_factor(self, method=None, voltage=None):
         ):
             if method == "kinematical":
                 structure_factors[i] = get_kinematical_structure_factor(
-                    phase=self.phase,
-                    hkl=hkl,
-                    scattering_parameter=s,
+                    phase=self.phase, hkl=hkl, scattering_parameter=s,
                 )
             else:
                 structure_factors[i] = get_doyleturner_structure_factor(
-                    phase=self.phase,
-                    hkl=hkl,
-                    scattering_parameter=s,
-                    voltage=voltage,
+                    phase=self.phase, hkl=hkl, scattering_parameter=s, voltage=voltage,
                 )
         self._structure_factor = np.where(
             structure_factors < _FLOAT_EPS, 0, structure_factors

diff --git a/diffsims/generators/diffraction_generator.py b/diffsims/generators/diffraction_generator.py
@@ -189,10 +189,7 @@ def calculate_ed_data(
         )
 
     def calculate_profile_data(
-        self,
-        structure,
-        reciprocal_radius=1.0,
-        minimum_intensity=1e-3
+        self, structure, reciprocal_radius=1.0, minimum_intensity=1e-3
     ):
         """
         Calculates a one dimensional diffraction profile for a structure.