Skip to content

Updates copyright to 2017-2020, closes #49 #63

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jan 31, 2020
Merged

Updates copyright to 2017-2020, closes #49 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa7a3ed
Updates copyright to 2017-2020
pc494 Jan 30, 2020
9cd5257
Resolves the merge problems
pc494 Jan 30, 2020
75232cd
Deleting the things that needed to go
pc494 Jan 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion diffsims/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/generators/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/generators/diffraction_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/generators/library_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
4 changes: 2 additions & 2 deletions diffsims/generators/rotation_list_generators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down Expand Up @@ -82,7 +82,7 @@ def get_grid_streographic(crystal_system,resolution,equal='angle'):
Returns
-------
rotation_list : list of tuples
List of rotations
List of rotations
"""
beam_directions_rzxz = beam_directions_to_euler_angles(get_beam_directions(crystal_system,resolution,equal=equal))
beam_directions_szxz = beam_directions_rzxz.to_AxAngle().to_Euler(axis_convention='szxz') # convert to high speed convention
Expand Down
2 changes: 1 addition & 1 deletion diffsims/libraries/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/libraries/diffraction_library.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/libraries/structure_library.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/libraries/vector_library.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/release_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "diffsims"
version = "0.2.0dev"
author = "Duncan Johnstone, Phillip Crout"
copyright = "Copyright 2017-2019, The pyXem Developers"
copyright = "Copyright 2017-2020, The pyXem Developers"
credits = ["Duncan Johnstone", "Phillip Crout", "Ben Martineau", "Simon Hogas"]
license = "GPLv3"
maintainer = "Duncan Johnstone, Phillip Crout"
Expand Down
2 changes: 1 addition & 1 deletion diffsims/sims/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/sims/diffraction_simulation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/sims/kinematic_simulation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/tests/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/tests/test_generators/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/tests/test_generators/test_diffraction_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/tests/test_generators/test_library_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/tests/test_generators/test_rotation_list_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/tests/test_library/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/tests/test_library/test_diffraction_library.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/tests/test_library/test_structure_library.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/tests/test_library/test_vector_library.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/tests/test_sims/test_diffraction_simulation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/tests/test_utils/test_gridding_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/tests/test_utils/test_rotation_conversion_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/tests/test_utils/test_sim_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/utils/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/utils/atomic_scattering_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/utils/discretise_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/utils/fourier_transform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/utils/fundemental_zone_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/utils/generic_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/utils/gridding_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/utils/lobato_scattering_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/utils/probe_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/utils/rotation_conversion_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/utils/scattering_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/utils/sim_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion diffsims/utils/vector_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2019 The diffsims developers
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
Expand Down