Skip to content

Commit

Permalink
Merge branch 'prepare_release' of https://github.com/EasyScience/Easy…
Browse files Browse the repository at this point in the history
…Crystallography into prepare_release
  • Loading branch information
rozyczko committed Oct 31, 2024
2 parents 06d867a + 1c446cc commit e46614c
Show file tree
Hide file tree
Showing 14 changed files with 23 additions and 45 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ EasyCrystallography is a library used to generate and manipulate crystal structu

* Documentation: https://easyscience.github.io/EasyCrystallography
* Source code: https://github.com/EasyScience/EasyCrystallography
* Bug reports: https://github.com/EasyScience/EasyCrystallography
* Bug reports: https://github.com/EasyScience/EasyCrystallography/issues

## Contributing

Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ dev = [
homepage = 'https://github.com/EasyScience/EasyCrystallography'
documentation = 'https://easyscience.github.io/EasyCrystallography'
source = 'https://github.com/EasyScience/EasyCrystallography'
tracker = 'https://github.com/EasyScience/EasyCrystallography'
tracker = 'https://github.com/EasyScience/EasyCrystallography/issues'

# Select the build system hatch -- Python project manager
# https://hatch.pypa.io/
Expand Down Expand Up @@ -89,7 +89,7 @@ select = [
# flake8 settings from existing CI setup
'E9', 'F63', 'F7', 'F82',
# pycodestyle
'E',
'E', 'W',
# Pyflakes
'F',
# pyupgrade
Expand Down
5 changes: 3 additions & 2 deletions resources/scripts/generate_html.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
__author__ = "github.com/wardsimon"
__version__ = "0.0.1"
# SPDX-FileCopyrightText: 2024 EasyCrystallography contributors
# SPDX-License-Identifier: BSD-3-Clause
# © 2022-2024 Contributors to the EasyCrystallography project <https://github.com/EasyScience/EasyCrystallography>

import sys

Expand Down
3 changes: 0 additions & 3 deletions src/easycrystallography/Components/AtomicDisplacement.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@

from __future__ import annotations

__author__ = 'github.com/wardsimon'
__version__ = '0.1.0'

from typing import TYPE_CHECKING
from typing import ClassVar
from typing import List
Expand Down
2 changes: 1 addition & 1 deletion src/easycrystallography/Components/Displacement.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# SPDX-FileCopyrightText: 2024 EasyCrystallography contributors
# SPDX-License-Identifier: BSD-3-Clause
# © 2022-2024 Contributors to the EasyCrystallography project <https://github.com/EasyScience/EasyCrystallography>
# © 2022-2024 Contributors to the EasyCrystallography project <https://github.com/EasyScience/EasyCrystallography>
2 changes: 1 addition & 1 deletion src/easycrystallography/Components/Specie.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,4 +154,4 @@ def is_ion(self):

@property
def is_isotope(self):
return self._raw_data["isotope"] is not None
return self._raw_data["isotope"] is not None
2 changes: 1 addition & 1 deletion src/easycrystallography/Elements/periodic_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -1655,4 +1655,4 @@ def formula_double_format(afloat, ignore_ones=True, tol=1e-8):
return ""
if abs(afloat - int(afloat)) < tol:
return str(int(afloat))
return str(round(afloat, 8))
return str(round(afloat, 8))
10 changes: 3 additions & 7 deletions src/easycrystallography/Symmetry/Bonding.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
# SPDX-FileCopyrightText: 2024 EasyCrystallography contributors <crystallography@easyscience.software>
# SPDX-License-Identifier: BSD-3-Clause
# © 2022-2023 Contributors to the EasyScience project <https://github.com/EasyScience/EasyCrystallography>


__author__ = 'github.com/wardsimon'
__version__ = '0.1.0'
# SPDX-FileCopyrightText: 2024 EasyCrystallography contributors
# SPDX-License-Identifier: BSD-3-Clause
# © 2022-2024 Contributors to the EasyCrystallography project <https://github.com/EasyScience/EasyCrystallography>

from typing import List
from typing import Tuple
Expand Down
4 changes: 0 additions & 4 deletions src/easycrystallography/Symmetry/SymOp.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
__status__ = "Production"
__date__ = "Sep 23, 2011"

# SPDX-FileCopyrightText: 2024 EasyCrystallography contributors <crystallography@easyscience.software>
# SPDX-License-Identifier: BSD-3-Clause
# © 2022-2023 Contributors to the EasyScience project <https://github.com/EasyScience/EasyCrystallography>

from typing import List
from typing import Tuple
from typing import Union
Expand Down
10 changes: 3 additions & 7 deletions src/easycrystallography/Symmetry/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# SPDX-FileCopyrightText: 2024 EasyCrystallography contributors <crystallography@easyscience.software>
# SPDX-License-Identifier: BSD-3-Clause
# © 2022-2023 Contributors to the EasyScience project <https://github.com/EasyScience/EasyCrystallography>


__author__ = 'github.com/wardsimon'
__version__ = '0.1.0'
# SPDX-FileCopyrightText: 2024 EasyCrystallography contributors
# SPDX-License-Identifier: BSD-3-Clause
# © 2022-2024 Contributors to the EasyCrystallography project <https://github.com/EasyScience/EasyCrystallography>
8 changes: 3 additions & 5 deletions src/easycrystallography/Symmetry/groups.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# coding: utf-8
# SPDX-FileCopyrightText: 2024 EasyCrystallography contributors <crystallography@easyscience.software>
# SPDX-License-Identifier: BSD-3-Clause
# © 2022-2023 Contributors to the EasyScience project <https://github.com/EasyScience/EasyCrystallography>

# SPDX-FileCopyrightText: 2024 EasyCrystallography contributors
# SPDX-License-Identifier: BSD-3-Clause
# © 2022-2024 Contributors to the EasyCrystallography project <https://github.com/EasyScience/EasyCrystallography>

"""
Defines SymmetryGroup parent class and PointGroup and SpaceGroup classes.
Expand Down
11 changes: 4 additions & 7 deletions src/easycrystallography/Symmetry/tools.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
# SPDX-FileCopyrightText: 2024 EasyCrystallography contributors <crystallography@easyscience.software>
# SPDX-License-Identifier: BSD-3-Clause
# © 2022-2023 Contributors to the EasyScience project <https://github.com/EasyScience/EasyCrystallography>


__author__ = 'github.com/wardsimon'
__version__ = '0.1.0'
# SPDX-FileCopyrightText: 2024 EasyCrystallography contributors
# SPDX-License-Identifier: BSD-3-Clause
# © 2022-2024 Contributors to the EasyCrystallography project <https://github.com/EasyScience/EasyCrystallography>

from typing import List

Expand Down Expand Up @@ -88,3 +84,4 @@ def get_int_from_HM(HM_str: str):
if not ints:
raise AttributeError
return ints[0]

3 changes: 0 additions & 3 deletions src/easycrystallography/io/cif/structures.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@

# from __future__ import annotations
#
# __author__ = 'github.com/wardsimon'
# __version__ = '0.0.1'
#
# from typing import List, NoReturn, TYPE_CHECKING, ClassVar, Tuple, Dict
#
# from easyscience.Objects.ObjectClasses import B
Expand Down
2 changes: 1 addition & 1 deletion src/easycrystallography/io/star.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,4 +221,4 @@ def _format_field(v):
else:
q = "'"
v = q + v + q
return v
return v

0 comments on commit e46614c

Please sign in to comment.