Merge pull request #60 from xsuite/release/v0.3.3

Release 0.3.3

Author: freddieknets

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "xcoll"
-version = "0.3.2"
+version = "0.3.3"
 description = "Xsuite collimation package"
 homepage = "https://github.com/xsuite/xcoll"
 repository = "https://github.com/xsuite/xcoll"

version.sh

@@ -5,6 +5,9 @@
 # Copyright (c) CERN, 2023.                 #
 # ######################################### #
 
+# Check necessary setup and installs
+gh pr list || exit 1
+
 if [ $# -eq 0 ]
 then
     echo "This script needs one argument: the new version number or a bump."
@@ -81,40 +84,35 @@ case ${answer:0:1} in
     ;;
 esac
 
-# Update version in a temporary branch
-poetry version $bump || (echo "Poetry version failed! Aborting..."; exit 1)
+# Update version in the release branch
+poetry version $bump || (echo "Poetry version failed! Aborting..."; exit 1);[ "$?" -eq 1 ] && exit 1
 new_ver=$( poetry version | awk '{print $2;}' )
 if [[ "$new_ver" != "$expected_ver" ]]
 then
     echo "Fatal error: poetry --dry-run expected $expected_ver, but result is $new_ver..."
     exit 1
 fi
-sed -i "s/\(__version__ =\).*/\1 '"${new_ver}"'/"         xcoll/general.py
-sed -i "s/\(assert __version__ ==\).*/\1 '"${new_ver}"'/" tests/test_version.py
+sed -i "s/\(__version__ =\).*/\1 '"${new_ver}"'/"         xcoll/general.py || (echo "Sed failed! Aborting..."; exit 1);[ "$?" -eq 1 ] && exit 1
+sed -i "s/\(assert __version__ ==\).*/\1 '"${new_ver}"'/" tests/test_version.py || (echo "Sed failed! Aborting..."; exit 1);[ "$?" -eq 1 ] && exit 1
 git reset
 git add pyproject.toml xcoll/general.py tests/test_version.py
-git commit --no-verify -m "Updated version number to v"${new_ver}"." || (echo "Git commit version failed! Aborting..."; exit 1)
+git commit --no-verify -m "Updated version number to v"${new_ver}"." || (echo "Git commit version failed! Aborting..."; exit 1);[ "$?" -eq 1 ] && exit 1
 git push
 
 # Make and accept pull request
-gh pr create --base main --title "Release "${new_ver} --fill || (echo "gh pr create failed! Aborting..."; exit 1)
+gh pr create --base main --title "Release "${new_ver} --fill || (echo "gh pr create failed! Aborting..."; exit 1);[ "$?" -eq 1 ] && exit 1
 git switch main
 git pull
 PR=$( gh pr list --head $branch | tail -1 | awk '{print $1;}' )
-gh pr merge ${PR} --merge --admin --delete-branch || (echo "gh pr merge failed! Aborting..."; exit 1)
+gh pr merge ${PR} --merge --admin --delete-branch || (echo "gh pr merge failed! Aborting..."; exit 1);[ "$?" -eq 1 ] && exit 1
 git pull
 
 # Make a tag
 git tag v${new_ver}
 git push origin v${new_ver}
 
-# Draft release notes
-curl \
-  -X POST \
-  -H "Accept: application/vnd.github+json" \
-  -H "Authorization: Bearer "$(cat ../github_token) \
-  https://api.github.com/repos/xsuite/xcoll/releases \
-  -d '{"tag_name":"v'${new_ver}'","target_commitish":"main","name":"Xcoll release '${new_ver}'","body":"","draft":true,"prerelease":false,"generate_release_notes":true}'
+# Draft release
+gh release create v${new_ver} --draft --generate-notes --title "Xcoll release ${new_ver}" --verify-tag
 
 # Build release and publish to PyPi
 poetry publish --build

xcoll/beam_elements/everest.py

@@ -69,11 +69,9 @@ def __init__(self, **kwargs):
         if '_xobject' not in kwargs:
             try:   # TODO: small workaround until PR
                 self.compile_kernels(use_prebuilt_kernels=use_prebuilt_kernels,
-                                 particles_class=xp.Particles,
-                                 only_if_needed=True)
+                                     only_if_needed=True)
             except TypeError:
-                self.compile_kernels(particles_class=xp.Particles,
-                                 only_if_needed=True)
+                self.compile_kernels(only_if_needed=True)
             self._context.kernels.EverestBlock_set_material(el=self)
 
 
@@ -88,7 +86,7 @@ def material(self, material):
                 raise ValueError("Invalid material!")
         if not xt.line._dicts_equal(self.material.to_dict(), material.to_dict()):
             self._material = material
-            self.compile_kernels(particles_class=xp.Particles, only_if_needed=True)
+            self.compile_kernels(only_if_needed=True)
             self._context.kernels.EverestBlock_set_material(el=self)
 
     def get_backtrack_element(self, _context=None, _buffer=None, _offset=None):
@@ -141,11 +139,9 @@ def __init__(self, **kwargs):
         if '_xobject' not in kwargs:
             try:   # TODO: small workaround until PR
                 self.compile_kernels(use_prebuilt_kernels=use_prebuilt_kernels,
-                                 particles_class=xp.Particles,
-                                 only_if_needed=True)
+                                     only_if_needed=True)
             except TypeError:
-                self.compile_kernels(particles_class=xp.Particles,
-                                 only_if_needed=True)
+                self.compile_kernels(only_if_needed=True)
             self._context.kernels.EverestCollimator_set_material(el=self)
 
     @property
@@ -159,7 +155,7 @@ def material(self, material):
                 raise ValueError("Invalid material!")
         if not xt.line._dicts_equal(self.material.to_dict(), material.to_dict()):
             self._material = material
-            self.compile_kernels(particles_class=xp.Particles, only_if_needed=True)
+            self.compile_kernels(only_if_needed=True)
             self._context.kernels.EverestCollimator_set_material(el=self)
 
     def get_backtrack_element(self, _context=None, _buffer=None, _offset=None):
@@ -242,11 +238,9 @@ def __init__(self, **kwargs):
                 self._bending_radius = self.active_length / np.sin(bending_angle)
             try:   # TODO: small workaround until PR
                 self.compile_kernels(use_prebuilt_kernels=use_prebuilt_kernels,
-                                 particles_class=xp.Particles,
-                                 only_if_needed=True)
+                                     only_if_needed=True)
             except TypeError:
-                self.compile_kernels(particles_class=xp.Particles,
-                                 only_if_needed=True)
+                self.compile_kernels(only_if_needed=True)
             self._context.kernels.EverestCrystal_set_material(el=self)
 
 
@@ -296,7 +290,7 @@ def material(self, material):
                 raise ValueError("Invalid material!")
         if not xt.line._dicts_equal(self.material.to_dict(), material.to_dict()):
             self._material = material
-            self.compile_kernels(particles_class=xp.Particles, only_if_needed=True)
+            self.compile_kernels(only_if_needed=True)
             self._context.kernels.EverestCrystal_set_material(el=self)
 
 
@@ -313,18 +307,3 @@ def _lattice_setter(lattice):
     else:
         raise ValueError(f"Illegal value {lattice} for 'lattice'! "
                         + "Only use 'strip' (110) or 'quasi-mosaic' (111).")
-
-
-# TODO: We want this in the HybridClass to get Kernels attached automatically,
-#       like the PerParticlePyMethod in BeamElement
-# def _exec_kernel(el, kernel_name, **kwargs):
-# #     context = el._context
-# #     desired_classes  = tuple(a.atype for a in el._kernels[kernel_name].args)
-# #     if (kernel_name, desired_classes) not in context.kernels:
-# #         el.compile_kernels(particles_class=xp.Particles)
-# #     kern = context.kernels[(kernel_name, desired_classes)]
-# #     return kern(el=el._xobject, **kwargs)
-#     el.compile_kernels(particles_class=xp.Particles, only_if_needed=True)
-#     return getattr(el._context.kernels, kernel_name)(el=el, **kwargs)
-
-