diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index ca3539c..fd3e1bd 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -35,7 +35,7 @@ jobs: needs: pre-commit strategy: matrix: - python-version: ["3.10", "3.11", "3.12"] + python-version: ["3.11", "3.12"] fail-fast: false env: TZ: America/New_York @@ -113,10 +113,10 @@ jobs: sudo rm -f /usr/share/miniconda/.condarc - name: Setup umamba - uses: mamba-org/setup-micromamba@b09ef9b599704322748535812ca03efb2625677b # v2 + uses: mamba-org/setup-micromamba@7f29b8b80078b1b601dfa018b0f7425c587c63bb # v2.0.6 with: environment-file: envs/env-py${{ env.PYTHONVER }}.yml - log-level: info + log-level: debug env: CONDA_OVERRIDE_GLIBC: "2.28" @@ -150,7 +150,7 @@ jobs: - name: Export of the env .yml file run: | - conda env export -f ${ARTIFACTS_DIR}/${CONDA_PACK_ENV_NAME}.yml + conda env export -f ${ARTIFACTS_DIR}/${CONDA_PACK_ENV_NAME}.yml --format=yaml cat ${ARTIFACTS_DIR}/${CONDA_PACK_ENV_NAME}.yml # https://github.com/actions/upload-artifact @@ -208,7 +208,7 @@ jobs: repo: "tes-profile-collection" branch: "main" beamline-acronym: "tes" - python-version: ["3.10", "3.11", "3.12"] + python-version: ["3.11", "3.12"] fail-fast: false env: TZ: America/New_York diff --git a/configs/config-py310.yml b/configs/config-py310.yml index a2ae0e3..a0f7411 100644 --- a/configs/config-py310.yml +++ b/configs/config-py310.yml @@ -1,5 +1,5 @@ docker_image: "quay.io/condaforge/linux-anvil-cos7-x86_64:latest" -env_name: "2025-2.2-py310-tiled" +env_name: "2025-3.0-py310-tiled" conda_env_file: "env-py310.yml" conda_binary: "mamba" python_version: "3.10" @@ -19,7 +19,7 @@ zenodo_metadata: title: "NSLS-II collection conda environment" upload_type: "software" description: "NSLS-II collection conda environment" - version: 2025-2.2-tiled + version: 2025-3.0-tiled creators: - name: Rakitin, Max affiliation: "Brookhaven National Laboratory" diff --git a/configs/config-py311.yml b/configs/config-py311.yml index 8232111..64095f5 100644 --- a/configs/config-py311.yml +++ b/configs/config-py311.yml @@ -1,5 +1,5 @@ docker_image: "quay.io/condaforge/linux-anvil-cos7-x86_64:latest" -env_name: "2025-2.2-py311-tiled" +env_name: "2025-3.0-py311-tiled" conda_env_file: "env-py311.yml" conda_binary: "mamba" python_version: "3.11" @@ -19,7 +19,7 @@ zenodo_metadata: title: "NSLS-II collection conda environment" upload_type: "software" description: "NSLS-II collection conda environment" - version: 2025-2.2-tiled + version: 2025-3.0-tiled creators: - name: Rakitin, Max affiliation: "Brookhaven National Laboratory" diff --git a/configs/config-py312.yml b/configs/config-py312.yml index e14151d..ff0f62b 100644 --- a/configs/config-py312.yml +++ b/configs/config-py312.yml @@ -1,5 +1,5 @@ docker_image: "quay.io/condaforge/linux-anvil-cos7-x86_64:latest" -env_name: "2025-2.2-py312-tiled" +env_name: "2025-3.0-py312-tiled" conda_env_file: "env-py312.yml" conda_binary: "mamba" python_version: "3.12" @@ -19,7 +19,7 @@ zenodo_metadata: title: "NSLS-II collection conda environment" upload_type: "software" description: "NSLS-II collection conda environment" - version: 2025-2.2-tiled + version: 2025-3.0-tiled creators: - name: Rakitin, Max affiliation: "Brookhaven National Laboratory" diff --git a/envs/env-py310.yml b/envs/env-py310.yml index df35ff1..aa70ea1 100644 --- a/envs/env-py310.yml +++ b/envs/env-py310.yml @@ -1,4 +1,4 @@ -name: 2025-2.2-py310-tiled +name: 2025-3.0-py310-tiled channels: - conda-forge dependencies: @@ -18,18 +18,19 @@ dependencies: - awkward - black - blosc-hdf5-plugin - - bluesky >=1.14.2 + - bluesky >=1.14.4 - bluesky-adaptive >=0.3.1 - bluesky-kafka >=0.10.0 - bluesky-live >=0.0.8 - bluesky-queueserver >=0.0.19 - bluesky-queueserver-api >=0.0.10 - - bluesky-tiled-plugins >=2.0.0b64 + - bluesky-tiled-plugins >=2.0.0b68 - bluesky-widgets >=0.0.15 - bokeh - boto3 - bottleneck # - broh5 + - cditools >=0.1.0 - chxtools - cmasher - conda-pack @@ -43,7 +44,7 @@ dependencies: - dask-jobqueue - dask-ml - dask-xgboost - - databroker >=2.0.0b64 + - databroker >=2.0.0b68 - datview - dictdiffer - diffpy.pdffit2 @@ -58,6 +59,7 @@ dependencies: - eiger-io - event-model >=1.21 - fabio + - fastapi >=0.115.8 - ffmpeg >=4.0 - flake8 - fpdf2 @@ -86,8 +88,8 @@ dependencies: - ispyb - isstools - jedi - - julia - - juliaup + # - julia + # - juliaup - jupyter - jupyterlab - larixite @@ -108,14 +110,16 @@ dependencies: - nexpy >=1.0.7 - nodejs - nsls2-detector-handlers >=0.0.3 - - nslsii >=0.11.1 + - nslsii >=0.11.4 + - numba-cuda + - cuda-version >=12,<13 - numexpr >=2.8.0,!=2.8.4 - numpy >=1.20 - nyxtools >=0.0.12 - oct2py - opencv - openmpi >=4.1.4 - - ophyd >=1.10.5 + - ophyd >=1.11.0 # pandas and deps - pandas - openpyxl # used by pandas .to_excel() @@ -130,7 +134,6 @@ dependencies: - pillow - pocl # needed by pyopencl, used by the `xrt` package - pre-commit - - prefect >=2.18,<3 - py-xgboost - py4xs - pycentroids @@ -143,7 +146,6 @@ dependencies: - pymatgen >=2024.5.1 - maggma >=0.66 - mp-api >=0.41.2 - - pymca - pymcr - pymongo >=3.7 - pyobjcryst @@ -165,6 +167,7 @@ dependencies: - redis-py - reportlab - requests + - rich # - sasview # does not work with pyqt>=5.15 - scikit-beam >=0.0.24 - scikit-learn @@ -184,7 +187,7 @@ dependencies: - suitcase-tiff >=0.4.0 - suitcase-utils - sympy - - tiled >=0.1.0b29 + - tiled >=0.1.6 - toml # Latest tomopy v1.15.2 has conflicts with some packages in this environment. - tomopy >=1.12.2 @@ -214,7 +217,7 @@ dependencies: # - gladier-tools - h5json - mimesis - - ophyd-async[ca,pva] >=0.10.0a2 + - ophyd-async[ca,pva] >=0.13.1 - ortools - pyhyperscattering[bluesky,ui] >=0.2.9 - refuse diff --git a/envs/env-py311.yml b/envs/env-py311.yml index 50ac6cb..e787976 100644 --- a/envs/env-py311.yml +++ b/envs/env-py311.yml @@ -1,4 +1,4 @@ -name: 2025-2.2-py311-tiled +name: 2025-3.0-py311-tiled channels: - conda-forge dependencies: @@ -18,18 +18,19 @@ dependencies: - awkward - black - blosc-hdf5-plugin - - bluesky >=1.14.2 + - bluesky >=1.14.4 - bluesky-adaptive >=0.3.1 - bluesky-kafka >=0.10.0 - bluesky-live >=0.0.8 - bluesky-queueserver >=0.0.19 - bluesky-queueserver-api >=0.0.10 - - bluesky-tiled-plugins >=2.0.0b64 + - bluesky-tiled-plugins >=2.0.0b68 - bluesky-widgets >=0.0.15 - bokeh - boto3 - bottleneck # - broh5 + - cditools >=0.1.0 - chxtools - cmasher - conda-pack @@ -43,7 +44,7 @@ dependencies: - dask-jobqueue - dask-ml - dask-xgboost - - databroker >=2.0.0b64 + - databroker >=2.0.0b68 - datview - dictdiffer - diffpy.pdffit2 @@ -58,6 +59,7 @@ dependencies: - eiger-io - event-model >=1.21 - fabio + - fastapi >=0.115.8 - ffmpeg >=4.0 - flake8 - fpdf2 @@ -86,8 +88,8 @@ dependencies: - ispyb - isstools - jedi - - julia - - juliaup + # - julia + # - juliaup - jupyter - jupyterlab - larixite @@ -108,14 +110,16 @@ dependencies: - nexpy >=1.0.7 - nodejs - nsls2-detector-handlers >=0.0.3 - - nslsii >=0.11.1 + - nslsii >=0.11.4 + - numba-cuda + - cuda-version >=12,<13 - numexpr >=2.8.0,!=2.8.4 - numpy >=1.20 - nyxtools >=0.0.12 - oct2py - opencv - openmpi >=4.1.4 - - ophyd >=1.10.5 + - ophyd >=1.11.0 # pandas and deps - pandas - openpyxl # used by pandas .to_excel() @@ -130,7 +134,6 @@ dependencies: - pillow - pocl # needed by pyopencl, used by the `xrt` package - pre-commit - - prefect >=2.18,<3 - py-xgboost - py4xs - pycentroids @@ -143,7 +146,6 @@ dependencies: - pymatgen >=2024.5.1 - maggma >=0.66 - mp-api >=0.41.2 - - pymca - pymcr - pymongo >=3.7 - pyobjcryst @@ -165,6 +167,7 @@ dependencies: - redis-py - reportlab - requests + - rich # - sasview # does not work with pyqt>=5.15 - scikit-beam >=0.0.24 - scikit-learn @@ -184,7 +187,7 @@ dependencies: - suitcase-tiff >=0.4.0 - suitcase-utils - sympy - - tiled >=0.1.0b29 + - tiled >=0.1.6 - toml # Latest tomopy v1.15.2 has conflicts with some packages in this environment. - tomopy >=1.12.2 @@ -214,7 +217,7 @@ dependencies: # - gladier-tools - h5json - mimesis - - ophyd-async[ca,pva] >=0.10.0a2 + - ophyd-async[ca,pva] >=0.13.1 - ortools - pyhyperscattering[bluesky,ui] >=0.2.9 - refuse diff --git a/envs/env-py312.yml b/envs/env-py312.yml index fef1eda..f806fbe 100644 --- a/envs/env-py312.yml +++ b/envs/env-py312.yml @@ -1,4 +1,4 @@ -name: 2025-2.2-py312-tiled +name: 2025-3.0-py312-tiled channels: - conda-forge dependencies: @@ -18,18 +18,19 @@ dependencies: - awkward - black - blosc-hdf5-plugin - - bluesky >=1.14.2 + - bluesky >=1.14.4 - bluesky-adaptive >=0.3.1 - bluesky-kafka >=0.10.0 - bluesky-live >=0.0.8 - bluesky-queueserver >=0.0.19 - bluesky-queueserver-api >=0.0.10 - - bluesky-tiled-plugins >=2.0.0b64 + - bluesky-tiled-plugins >=2.0.0b68 - bluesky-widgets >=0.0.15 - bokeh - boto3 - bottleneck # - broh5 + - cditools >=0.1.0 - chxtools - cmasher - conda-pack @@ -43,7 +44,7 @@ dependencies: - dask-jobqueue - dask-ml - dask-xgboost - - databroker >=2.0.0b64 + - databroker >=2.0.0b68 - datview - dictdiffer - diffpy.pdffit2 @@ -58,6 +59,7 @@ dependencies: - eiger-io - event-model >=1.21 - fabio + - fastapi >=0.115.8 - ffmpeg >=4.0 - flake8 - fpdf2 @@ -86,8 +88,8 @@ dependencies: - ispyb - isstools - jedi - - julia - - juliaup + # - julia + # - juliaup - jupyter - jupyterlab - larixite @@ -108,14 +110,16 @@ dependencies: - nexpy >=1.0.7 - nodejs - nsls2-detector-handlers >=0.0.3 - - nslsii >=0.11.1 + - nslsii >=0.11.4 + - numba-cuda + - cuda-version >=12,<13 - numexpr >=2.8.0,!=2.8.4 - numpy >=1.20 - nyxtools >=0.0.12 - oct2py - opencv - openmpi >=4.1.4 - - ophyd >=1.10.5 + - ophyd >=1.11.0 # pandas and deps - pandas - openpyxl # used by pandas .to_excel() @@ -130,7 +134,6 @@ dependencies: - pillow - pocl # needed by pyopencl, used by the `xrt` package - pre-commit - - prefect >=2.18,<3 - py-xgboost - py4xs - pycentroids @@ -143,7 +146,6 @@ dependencies: - pymatgen >=2024.5.1 - maggma >=0.66 - mp-api >=0.41.2 - - pymca - pymcr - pymongo >=3.7 - pyobjcryst @@ -165,6 +167,7 @@ dependencies: - redis-py - reportlab - requests + - rich # - sasview # does not work with pyqt>=5.15 - scikit-beam >=0.0.24 - scikit-learn @@ -184,7 +187,7 @@ dependencies: - suitcase-tiff >=0.4.0 - suitcase-utils - sympy - - tiled >=0.1.0b29 + - tiled >=0.1.6 - toml # Latest tomopy v1.15.2 has conflicts with some packages in this environment. - tomopy >=1.12.2 @@ -214,7 +217,7 @@ dependencies: # - gladier-tools - h5json - mimesis - - ophyd-async[ca,pva] >=0.10.0a2 + - ophyd-async[ca,pva] >=0.13.1 - ortools - pyhyperscattering[bluesky,ui] >=0.2.9 - refuse diff --git a/import-tests.py b/import-tests.py index 03b1da1..25cf056 100644 --- a/import-tests.py +++ b/import-tests.py @@ -10,6 +10,8 @@ import numexpr import larch import larch.xrd +import numba +from numba import cuda parser = argparse.ArgumentParser(description="Test import of various Python packages.") parser.add_argument( @@ -35,3 +37,5 @@ print(f"{nslsii.__version__ = }") print(f"{numexpr.__version__ = }") print(f"{larch.__version__ = }") +print(f"{numba.__version__ = }") +print(cuda.__file__)