Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Sep 8, 2023
1 parent 3ea2393 commit 7ff8dc8
Show file tree
Hide file tree
Showing 15 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion docs/cli/functions.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
predict
integrate
```
```
2 changes: 1 addition & 1 deletion docs/cli/initial_solution.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ Full parameter definitions

.. phil:: laue_dials.command_line.initial_solution.working_phil
:expert-level: 2
:attributes-level: 2
:attributes-level: 2
2 changes: 1 addition & 1 deletion docs/cli/integrate.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ Full parameter definitions

.. phil:: laue_dials.command_line.integrate.working_phil
:expert-level: 2
:attributes-level: 2
:attributes-level: 2
2 changes: 1 addition & 1 deletion docs/cli/optimize_indexing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ Full parameter definitions

.. phil:: laue_dials.command_line.optimize_indexing.working_phil
:expert-level: 2
:attributes-level: 2
:attributes-level: 2
2 changes: 1 addition & 1 deletion docs/cli/predict.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ Full parameter definitions

.. phil:: laue_dials.command_line.predict.working_phil
:expert-level: 2
:attributes-level: 2
:attributes-level: 2
2 changes: 1 addition & 1 deletion docs/cli/refine.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ Full parameter definitions

.. phil:: laue_dials.command_line.refine.working_phil
:expert-level: 2
:attributes-level: 2
:attributes-level: 2
1 change: 0 additions & 1 deletion docs/cli/sequence_to_stills.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,3 @@ Full parameter definitions
.. phil:: laue_dials.command_line.sequence_to_stills.phil_scope
:expert-level: 2
:attributes-level: 2

6 changes: 2 additions & 4 deletions src/laue_dials/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@

if sys.version_info[:2] >= (3, 8):
# TODO: Import directly (no need for conditional) when `python_requires = >= 3.8`
from importlib.metadata import (PackageNotFoundError, # pragma: no cover
version)
from importlib.metadata import PackageNotFoundError, version # pragma: no cover
else:
from importlib_metadata import (PackageNotFoundError, # pragma: no cover
version)
from importlib_metadata import PackageNotFoundError, version # pragma: no cover

try:
# Change here if project is renamed and does not equal the package name
Expand Down
5 changes: 3 additions & 2 deletions src/laue_dials/algorithms/laue.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,9 @@ def gen_beam_models(expts, refls):
# Imports
from copy import deepcopy

from dials.algorithms.refinement.prediction.managed_predictors import \
ExperimentsPredictorFactory
from dials.algorithms.refinement.prediction.managed_predictors import (

Check warning on line 103 in src/laue_dials/algorithms/laue.py

View check run for this annotation

Codecov / codecov/patch

src/laue_dials/algorithms/laue.py#L103

Added line #L103 was not covered by tests
ExperimentsPredictorFactory,
)

# Instantiate new ExperimentList/reflection_table
new_expts = ExperimentList()
Expand Down
7 changes: 5 additions & 2 deletions src/laue_dials/command_line/initial_solution.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@
from dials.util import show_mail_handle_errors
from dials.util.options import ArgumentParser

from laue_dials.algorithms.monochromatic import (find_spots, initial_index,
scan_varying_refine)
from laue_dials.algorithms.monochromatic import (
find_spots,
initial_index,
scan_varying_refine,
)

logger = logging.getLogger("laue-dials.command_line.initial_solution")

Expand Down
3 changes: 1 addition & 2 deletions src/laue_dials/command_line/integrate.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
from cctbx import sgtbx
from dials.array_family import flex
from dials.util import show_mail_handle_errors
from dials.util.options import (ArgumentParser,
reflections_and_experiments_from_files)
from dials.util.options import ArgumentParser, reflections_and_experiments_from_files

from laue_dials.algorithms.integration import SegmentedImage

Expand Down
3 changes: 1 addition & 2 deletions src/laue_dials/command_line/optimize_indexing.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
import numpy as np
from dials.array_family.flex import reflection_table
from dials.util import show_mail_handle_errors
from dials.util.options import (ArgumentParser,
reflections_and_experiments_from_files)
from dials.util.options import ArgumentParser, reflections_and_experiments_from_files
from dxtbx.model import ExperimentList

logger = logging.getLogger("laue-dials.command_line.optimize_indexing")
Expand Down
3 changes: 1 addition & 2 deletions src/laue_dials/command_line/predict.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
from dials.array_family import flex
from dials.array_family.flex import reflection_table
from dials.util import show_mail_handle_errors
from dials.util.options import (ArgumentParser,
reflections_and_experiments_from_files)
from dials.util.options import ArgumentParser, reflections_and_experiments_from_files
from dxtbx.model import ExperimentList

from laue_dials.algorithms.outliers import gen_kde
Expand Down
9 changes: 6 additions & 3 deletions src/laue_dials/command_line/refine.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@
from dxtbx.model import ExperimentList
from dxtbx.model.experiment_list import ExperimentListFactory

from laue_dials.algorithms.laue import (gen_beam_models, remove_beam_models,
store_wavelengths)
from laue_dials.algorithms.laue import (
gen_beam_models,
remove_beam_models,
store_wavelengths,
)

logger = logging.getLogger("laue-dials.command_line.refine")

Expand Down Expand Up @@ -92,7 +95,7 @@
min_nref_per_parameter = 1
}
spherical_relp_model = True
}
}
Expand Down
3 changes: 1 addition & 2 deletions src/laue_dials/command_line/sequence_to_stills.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
from dials.array_family import flex
from dials.array_family.flex import reflection_table
from dials.util import show_mail_handle_errors
from dials.util.options import (OptionParser,
reflections_and_experiments_from_files)
from dials.util.options import OptionParser, reflections_and_experiments_from_files
from dxtbx.model import MosaicCrystalSauter2014
from dxtbx.model.experiment_list import Experiment, ExperimentList
from libtbx.phil import parse
Expand Down

0 comments on commit 7ff8dc8

Please sign in to comment.