Merge branch '157-new-roi-threshold-overflow-control' into 'master'

Resolve "new roi threshold overflow control" Closes #157 See merge request limagroup/lima!203
esrf-bliss · Aug 12, 2021 · ffa6849 · ffa6849
2 parents bd5a313 + 1b6bb70
commit ffa6849
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/applications/tango/python b/applications/tango/python
diff --git a/conda/debug/meta.yaml b/conda/debug/meta.yaml
@@ -21,7 +21,7 @@ requirements:
   host:
     - python {{ python }}
     - sip 4.19.8           #For the SIP module
-    - processlib 1.7*
+    - processlib 1.8*
     - libconfig 1.7*
     # I/O formats
     - zlib

diff --git a/conda/release/meta.yaml b/conda/release/meta.yaml
@@ -19,7 +19,7 @@ requirements:
   host:
     - python {{ python }}
     - sip 4.19.8           #For the SIP module
-    - processlib 1.7*
+    - processlib 1.8*
     - libconfig 1.7*
     # I/O formats
     - zlib

diff --git a/third-party/Processlib b/third-party/Processlib
+4 −1		doc/index.rst
+10 −1		doc/plugins/roi2spectrum.rst
+55 −0		doc/plugins/roicollection.rst
+13 −2		doc/plugins/roicounter.rst