Skip to content

Commit

Permalink
Merge pull request #48 from European-XFEL/extra-data-1.18
Browse files Browse the repository at this point in the history
Update Extra-data to 1.18
  • Loading branch information
takluyver authored Sep 23, 2024
2 parents b6d9961 + f103533 commit 1b0bf4f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
12 changes: 7 additions & 5 deletions custom-recipes/recipes/extra-data/recipe.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
context:
name: extra-data
version: 1.17.0
version: 1.18.0

package:
name: '{{ name|lower }}'
version: '{{ version }}'

source:
url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/EXtra-data-{{ version }}.tar.gz
sha256: c90e96bc04ec11816fd36ca77010cc77f923b21f3c8131dcf8d35b7360e38e6e
url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/extra_data-{{ version }}.tar.gz
sha256: 81f266f9d0d64719e7a4ca96492c5297fffa7d03ab170f1b68476688a3e3b67d

build:
entry_points:
- lsxfel = extra_data.lsxfel:main
- karabo-bridge-serve-files = extra_data.cli.serve_files:main
- karabo-bridge-serve-run = extra_data.cli.serve_run:main
- extra-data-validate = extra_data.validation:main
- extra-data-make-virtual-cxi = extra_data.cli.make_virtual_cxi:main
- extra-data-locality = extra_data.locality:main
Expand All @@ -23,10 +24,10 @@ build:

requirements:
host:
- python >=3.6
- python >=3.9
- pip
run:
- python >=3.6
- python >=3.9
- h5py >=2.10
- numpy
- pandas
Expand All @@ -41,6 +42,7 @@ test:
- pip check
- lsxfel --help
- karabo-bridge-serve-files --help
- karabo-bridge-serve-run --help
- extra-data-validate --help
- extra-data-make-virtual-cxi --help
- extra-data-locality --help
Expand Down
13 changes: 9 additions & 4 deletions environments/202402/environment.lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ dependencies:
- bzip2=1.0.8
- c-ares=1.32.3
- c-blosc2=2.12.0
- ca-certificates=2024.7.4
- ca-certificates=2024.8.30
- cached-property=1.5.2
- cached_property=1.5.2
- cairo=1.16.0
- calibration-client=11.3.0
- certifi=2024.7.4
- certifi=2024.8.30
- certipy=0.1.3
- cfelpyutils=2.0.6
- cffi=1.16.0
Expand Down Expand Up @@ -111,7 +111,7 @@ dependencies:
- euxfel-bunch-pattern=0.6
- exceptiongroup=1.2.2
- expat=2.6.2
- extra-data=1.17.0
- extra-data=1.18.0
- extra-geom=1.12.0
- extra-hed=0.1.0
- fabio=2024.4.0
Expand Down Expand Up @@ -260,6 +260,7 @@ dependencies:
- libexpat=2.6.2
- libffi=3.4.2
- libflac=1.4.3
- libgcc=14.1.0
- libgcc-ng=14.1.0
- libgcrypt=1.11.0
- libgettextpo=0.22.5
Expand Down Expand Up @@ -311,6 +312,7 @@ dependencies:
- libspimage=1.0.0
- libsqlite=3.46.0
- libssh2=1.11.0
- libstdcxx=14.1.0
- libstdcxx-ng=14.1.0
- libsystemd0=255
- libtasn1=4.19.0
Expand Down Expand Up @@ -397,7 +399,7 @@ dependencies:
- opencv=4.8.0
- openh264=2.3.1
- openjpeg=2.5.0
- openssl=3.1.6
- openssl=3.1.7
- orc=1.9.0
- orjson=3.10.6
- p11-kit=0.24.1
Expand Down Expand Up @@ -629,4 +631,7 @@ dependencies:
- zlib-ng=2.0.7
- zstandard=0.23.0
- zstd=1.5.6
- pip:
- da-utils==0.1.0
- euxfel-extra==2024.1.2.46+ff9cde9
prefix: /gpfs/exfel/sw/software/mambaforge/22.11/envs/202402

0 comments on commit 1b0bf4f

Please sign in to comment.