Merge pull request #2516 from cta-observatory/fix_entry_points

Fix entry point specification

.github/workflows/ci.yml

@@ -163,7 +163,7 @@ jobs:
       - name: Install doc dependencies
         run: |
           sudo apt update --yes && sudo apt install --yes git build-essential pandoc graphviz ffmpeg
-          pip install -U pip towncrier
+          pip install -U pip towncrier setuptools
           pip install -e .[docs]
           pip install ./test_plugin
           git describe --tags

docs/conf.py

@@ -135,6 +135,8 @@ def setup(app):
     ("py:class", "traitlets.traitlets.ObserveHandler"),
     ("py:class", "dict[K, V]"),
     ("py:class", "G"),
+    ("py:class", "K"),
+    ("py:class", "V"),
     ("py:class", "t.Sequence"),
     ("py:class", "StrDict"),
     ("py:class", "ClassesType"),
@@ -144,6 +146,7 @@ def setup(app):
     ("py:obj", "traitlets.traitlets.T"),
     ("py:class", "traitlets.traitlets.T"),
     ("py:class", "re.Pattern[t.Any]"),
+    ("py:class", "re.Pattern"),
     ("py:class", "Sentinel"),
     ("py:class", "ObserveHandler"),
     ("py:obj", "traitlets.config.boolean_flag"),

pyproject.toml

@@ -110,11 +110,11 @@ SimTelEventSource = "ctapipe.io.simteleventsource:SimTelEventSource"
 
 
 [project.entry-points.ctapipe_reco]
-DispReconstructor = "ctapipe.reco.sklearn.DispReconstructor"
-HillasIntersection = "ctapipe.reco.hillas_intersection.HillasIntersection"
-HillasReconstructor = "ctapipe.reco.hillas_reconstructor.HillasReconstructor"
-EnergyRegressor = "ctapipe.reco.sklearn.EnergyRegressor"
-ParticleClassifier = "ctapipe.reco.sklearn.ParticleClassifier"
+HillasIntersection = "ctapipe.reco.hillas_intersection:HillasIntersection"
+HillasReconstructor = "ctapipe.reco.hillas_reconstructor:HillasReconstructor"
+DispReconstructor = "ctapipe.reco.sklearn:DispReconstructor"
+EnergyRegressor = "ctapipe.reco.sklearn:EnergyRegressor"
+ParticleClassifier = "ctapipe.reco.sklearn:ParticleClassifier"
 
 [project.urls]
 repository = "https://github.com/cta-observatory/ctapipe/"

src/ctapipe/core/container.py

@@ -329,7 +329,6 @@ def __init__(self, prefix=None, **fields):
         self.prefix = prefix if prefix is not None else self.default_prefix
 
         for k in set(self.fields).difference(fields):
-
             # deepcopy of None is surprisingly slow
             field = self.fields[k]
             if field.default_factory is not None:
@@ -417,8 +416,8 @@ def reset(self):
 
     def update(self, **values):
         """
-        update more than one parameter at once (e.g. `update(x=3,y=4)`
-        or `update(**dict_of_values)`)
+        update more than one parameter at once (e.g. ``update(x=3,y=4)``
+        or ``update(**dict_of_values)``)
         """
         for key in values:
             self[key] = values[key]