European-XFEL · JamesWrigley · Dec 16, 2024 · Dec 16, 2024
diff --git a/custom-recipes/build.sh b/custom-recipes/build.sh
@@ -31,6 +31,8 @@ fi
 
 conda index ./conda-bld
 
+echo "Building $p"
+
 boa build \
   --skip-existing \
   --target-platform=linux-64 \

diff --git a/custom-recipes/recipes/line-profiler/recipe.yaml b/custom-recipes/recipes/line-profiler/recipe.yaml
@@ -0,0 +1,54 @@
+context:
+  name: line_profiler
+  version: 4.2.0
+
+package:
+  name: '{{ name|lower }}'
+  version: '{{ version }}'
+
+source:
+  url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/line_profiler-{{ version }}.tar.gz
+  sha256: 09e10f25f876514380b3faee6de93fb0c228abba85820ba1a591ddb3eb451a96
+
+build:
+  entry_points:
+    - kernprof=kernprof:main
+  script: '{{ PYTHON }} -m pip install . -vv'
+  number: 0
+
+  skip:
+    - py<38
+requirements:
+  build:
+    - '{{ compiler("c") }}'
+    - '{{ compiler("cxx") }}'
+  host:
+    - python
+    - sel(py<40 and py>=38): setuptools >=68.2.2
+    - cython >=3.0.3
+    - cmake
+    - ninja
+    - pip
+  run:
+    - python
+
+test:
+  imports:
+    - line_profiler
+  commands:
+    - pip check
+    - kernprof --help
+  requires:
+    - pip
+
+about:
+  home: https://github.com/pyutils/line_profiler
+  summary: Line-by-line profiler
+  doc_url: https://pythonhosted.org/line-profiler/
+  license: BSD-3-Clause
+  license_file: LICENSE.txt
+
+extra:
+  recipe-maintainers:
+    - RobertRosca
+
diff --git a/custom-recipes/recipes/pasha/recipe.yaml b/custom-recipes/recipes/pasha/recipe.yaml
@@ -1,14 +1,14 @@
 context:
   name: pasha
-  version: 0.1.1
+  version: 0.1.2
 
 package:
   name: '{{ name|lower }}'
   version: '{{ version }}'
 
 source:
   url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/pasha-{{ version }}.tar.gz
-  sha256: a032687bb11a9609057602daa93ff59878153cc67473ed45923634cd35332592
+  sha256: 7133ae62639e3c88d18f9b16e61efda9200d1963dc49cf7019565cc5d61c6fe9
 
 build:
   noarch: python

diff --git a/environments/202402/1-base.yml b/environments/202402/1-base.yml
@@ -56,6 +56,7 @@ dependencies:
   - pyabel
   - pybaselines
   - pyfai
+  - pyhdf
   - pyopengl
   - pyqtgraph
   - pytest

diff --git a/environments/202402/2-custom.yml b/environments/202402/2-custom.yml
@@ -6,6 +6,7 @@ dependencies:
   - calibration-client >=11.3.0
   - cfelpyutils
   - condat-gridconv
+  - condor
   - damnit
   - envmodules
   - euxfel-bunch-pattern
@@ -16,11 +17,11 @@ dependencies:
   - hdf5-vds-check
   - karabo-bridge
   - karabo_bridge_recorder
+  - line-profiler
   - matplotlib-scalebar
   - metadata-client
   - metropc
   - nbclick
-  - pasha
+  - pasha >= 0.1.2
   - princess
-  - condor
 category: custom
diff --git a/environments/202402/environment.lock.yml b/environments/202402/environment.lock.yml
@@ -237,7 +237,6 @@ dependencies:
   - jupyterlab-git=0.50.2
   - jupyterlab-h5web=12.3.0
   - jupyterlab-lsp=5.0.3
-  - jupyterlab_code_formatter=1.6.0
   - jupyterlab_pygments=0.3.0
   - jupyterlab_server=2.27.3
   - jupyterlab_widgets=3.0.13
@@ -355,6 +354,7 @@ dependencies:
   - libzip=1.10.1
   - libzlib=1.2.13
   - libzopfli=1.0.3
+  - line_profiler=4.2.0
   - llvmlite=0.42.0
   - lmfit=1.3.2
   - locket=1.0.0
@@ -435,7 +435,7 @@ dependencies:
   - param=1.13.0
   - parso=0.8.4
   - partd=1.4.2
-  - pasha=0.1.1
+  - pasha=0.1.2
   - pathspec=0.12.1
   - patsy=0.5.6
   - pcre2=10.43
@@ -479,6 +479,7 @@ dependencies:
   - pyflakes=3.2.0
   - pygithub=2.5.0
   - pygments=2.18.0
+  - pyhdf=0.11.4
   - pyjwt=2.8.0
   - pylint=3.2.6
   - pylint-venv=3.0.4
@@ -677,5 +678,5 @@ dependencies:
   - zulip=0.9.0
   - pip:
       - da-utils==0.1.0
-      - euxfel-extra==2024.1.2.94+665b980
+      - euxfel-extra==2024.1.2.118+65ca7c8
 prefix: /gpfs/exfel/sw/software/mambaforge/22.11/envs/202402
diff --git a/environments/202402/environment.yml b/environments/202402/environment.yml
@@ -67,6 +67,7 @@ dependencies:
   - pyabel
   - pybaselines
   - pyfai
+  - pyhdf
   - pyopengl
   - pyqtgraph
   - pytest
@@ -100,6 +101,6 @@ dependencies:
   - metadata-client
   - metropc
   - nbclick
-  - pasha
+  - pasha >= 0.1.2
   - princess
   - condor
diff --git a/modules/julia/1.11 b/modules/julia/1.11
@@ -5,7 +5,7 @@
 module-whatis  "Load Julia (configured for XFEL)"
 
 prepend-path            PATH             /gpfs/exfel/sw/software/euxfel-environment-management/scripts/julia
-prepend-path            PATH             /gpfs/exfel/sw/software/juliaup/juliaup/julia-1.11.1+0.x64.linux.gnu/bin
+prepend-path            PATH             /gpfs/exfel/sw/software/juliaup/juliaup/julia-1.11.2+0.x64.linux.gnu/bin
 
 # https://docs.julialang.org/en/v1/manual/environment-variables/#JULIA_DEPOT_PATH
 if { [info exists env(SASE)] } {

diff --git a/modules/x_parallel/v1 b/modules/x_parallel/v1
@@ -0,0 +1,16 @@
+#%Module 1.0
+#
+# x_parallel 1.0
+#
+
+proc ModulesHelp {} {
+	puts stdout "This module sets up the x_parallel distribution"
+}
+
+module-whatis  "setup environment for x_parallel"
+prepend-path PATH /gps/exfel/sw/software/x_parallel/bin
+setenv VIRTUAL_ENV /gps/exfel/sw/software/x_parallel
+
+if { [module-info mode load] || [module-info mode switch2] } {
+	system "/gpfs/exfel/sw/software/local/etc/metrics.sh 'x_parallel'"
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,6 +56,7 @@ dependencies: @@
       - pyabel
       - pybaselines
       - pyfai
+      - pyhdf
       - pyopengl
       - pyqtgraph
       - pytest
@@ Expand Down @@