Linting and mypy fixes

Author: deveres99

tests/test_fixed_point_finder.py

@@ -2,8 +2,8 @@
 import pathlib
 
 import numpy as np
-import xpart as xp  # type: ignore[import-untyped]
-import xtrack as xt  # type: ignore[import-untyped]
+import xpart as xp  # type: ignore
+import xtrack as xt  # type: ignore
 
 from xnlbd.track import Henonmap
 from xnlbd.visualise.fixed_points import FPFinder

tests/test_henonmap.py

@@ -1,7 +1,7 @@
 import numpy as np
-import xpart as xp  # type: ignore[import-untyped]
-import xtrack as xt  # type: ignore[import-untyped]
-from xobjects.test_helpers import for_all_test_contexts  # type: ignore[import-untyped]
+import xpart as xp  # type: ignore
+import xtrack as xt  # type: ignore
+from xobjects.test_helpers import for_all_test_contexts  # type: ignore
 
 from xnlbd.track import Henonmap
 

tests/test_modulatedhenonmap.py

@@ -1,8 +1,8 @@
 import numpy as np
-import xpart as xp  # type: ignore[import-untyped]
-import xtrack as xt  # type: ignore[import-untyped]
-from scipy.special import factorial  # type: ignore[import-untyped]
-from xobjects.test_helpers import for_all_test_contexts  # type: ignore[import-untyped]
+import xpart as xp  # type: ignore
+import xtrack as xt  # type: ignore
+from scipy.special import factorial  # type: ignore
+from xobjects.test_helpers import for_all_test_contexts  # type: ignore
 
 from xnlbd.track import Henonmap, ModulatedHenonmap
 

tests/test_normed_particles.py

@@ -1,9 +1,9 @@
 import pathlib
 
 import numpy as np
-import xpart as xp  # type: ignore[import-untyped]
-import xtrack as xt  # type: ignore[import-untyped]
-from xobjects.test_helpers import for_all_test_contexts  # type: ignore[import-untyped]
+import xpart as xp  # type: ignore
+import xtrack as xt  # type: ignore
+from xobjects.test_helpers import for_all_test_contexts  # type: ignore
 
 from xnlbd.tools import NormedParticles
 

xnlbd/__init__.py

@@ -1,6 +1,2 @@
+from . import analyse, tools, track, visualise
 from ._version import __version__
-
-from . import analyse
-from . import tools
-from . import track
-from . import visualise

xnlbd/analyse/__init__.py

@@ -1 +1 @@
-from . import rdt
+from . import rdt

xnlbd/visualise/__init__.py

@@ -1,2 +1 @@
-from . import orbits
-from . import fixed_points
+from . import fixed_points, orbits

xnlbd/visualise/fixed_points/topological_fixed_point_finder.py

@@ -4,11 +4,11 @@
 from typing import Tuple, Union
 
 import numpy as np
-import xobjects as xo  # type: ignore[import-untyped]
-import xtrack as xt  # type: ignore[import-untyped]
-from xtrack import Line  # type: ignore[import-untyped]
-from xtrack.particles.particles import Particles  # type: ignore[import-untyped]
-from xtrack.twiss import TwissTable  # type: ignore[import-untyped]
+import xobjects as xo  # type: ignore
+import xtrack as xt  # type: ignore
+from xtrack import Line  # type: ignore
+from xtrack.particles.particles import Particles  # type: ignore
+from xtrack.twiss import TwissTable  # type: ignore
 
 from xnlbd.tools import NormedParticles
 

xnlbd/visualise/orbits/orbits.py

@@ -2,12 +2,12 @@
 from typing import Union
 
 import numpy as np
-import scipy.constants as sc  # type: ignore[import-untyped]
-import xpart as xp  # type: ignore[import-untyped]
-import xtrack as xt  # type: ignore[import-untyped]
-import xcoll as xc  # type: ignore[import-untyped]
-from xtrack import Line  # type: ignore[import-untyped]
-from xtrack.twiss import TwissTable  # type: ignore[import-untyped]
+import scipy.constants as sc  # type: ignore
+import xcoll as xc  # type: ignore
+import xpart as xp  # type: ignore
+import xtrack as xt  # type: ignore
+from xtrack import Line  # type: ignore
+from xtrack.twiss import TwissTable  # type: ignore
 
 from xnlbd.tools import NormedParticles
 
@@ -589,7 +589,7 @@ def get_orbit_points(
         - nemitt_x: normalised emittance in horizontal plane, default `1e-6`
         - nemitt_y: normalised emittance in vertical plane, default `1e-6`
         - nemitt_z: normalised emittance in longitudinal plane, default `1`
-        - xcoll_scattering: True if scattering should be enabled, otherwise 
+        - xcoll_scattering: True if scattering should be enabled, otherwise
           False, default `False`
 
     Output: