Merge pull request #146 from xsuite/release/v0.6.1

Release 0.6.1

Author: giadarol

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "xcoll"
-version = "0.6.0"
+version = "0.6.1"
 description = "Xsuite collimation package"
 homepage = "https://github.com/xsuite/xcoll"
 repository = "https://github.com/xsuite/xcoll"
@@ -28,7 +28,7 @@ pandas = ">=1.4"
 xobjects = ">=0.5.0"
 xdeps = ">=0.10.5"
 xpart = ">=0.23.0"
-xtrack = ">=0.84.5"
+xtrack = ">=0.84.6"
 
 [poetry.group.dev.dependencies]
 pytest = ">=7.3"

release.py

@@ -20,10 +20,10 @@
 #
 # Steps:
 #     - Version numbers are of the form major.minor.patch
-#     - Run `make_release_branch.py` with argument major, minor, path, or a version number.
+#     - Run `make_release_branch.py` with argument major, minor, patch, or a version number.
 #       Alternatively, manually make a release branch named release/v<version_number>
 #     - Make sure all changes are committed and pushed (working directory clean)
-#     - In this branch, run `release.py` (again with argument major, minor, path, or a version number).
+#     - In this branch, run `release.py` (again with argument major, minor, patch, or a version number).
 #       This will make the release, push to main, push to PyPI, and create draft release notes on GitHub.
 
 

tests/test_jaw_position.py

@@ -12,8 +12,6 @@
 import xcoll as xc
 import time
 
-import matplotlib.pyplot as plt
-
 # TODO: particle angles
 
 jaws = [0.001, [0.0013, -0.002789], [-1.2e-6, -3.2e-3], [3.789e-3, 4.678e-7]]
@@ -123,6 +121,8 @@ def _plot_jaws(coll, part_init, part, hit_ids, not_hit_ids):
     wrong_ids = part.parent_particle_id[mask]
     mask_wrong_init = np.isin(part_init.particle_id, wrong_ids)
 
+    import matplotlib.pyplot as plt
+
     mask_hit_init = np.isin(part_init.particle_id, hit_ids)
     mask_not_hit_init = np.isin(part_init.particle_id, not_hit_ids)
     plt.scatter(part_init.x[mask_not_hit_init], part_init.y[mask_not_hit_init], c='b', s=2)

tests/test_version.py

@@ -6,4 +6,4 @@
 from xcoll import __version__
 
 def test_version():
-    assert __version__ == '0.6.0'
+    assert __version__ == '0.6.1'

xcoll/general.py

@@ -12,5 +12,5 @@
 # ======================
 # Do not change
 # ======================
-__version__ = '0.6.0'
+__version__ = '0.6.1'
 # ======================