Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions configs/config-py310.yml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions configs/config-py311.yml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions configs/config-py312.yml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand Down
27 changes: 15 additions & 12 deletions envs/env-py310.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2025-2.2-py310-tiled
name: 2025-3.0-py310-tiled
channels:
- conda-forge
dependencies:
Expand All @@ -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
Expand All @@ -43,7 +44,7 @@ dependencies:
- dask-jobqueue
- dask-ml
- dask-xgboost
- databroker >=2.0.0b64
- databroker >=2.0.0b68
- datview
- dictdiffer
- diffpy.pdffit2
Expand All @@ -58,6 +59,7 @@ dependencies:
- eiger-io
- event-model >=1.21
- fabio
- fastapi >=0.115.8
- ffmpeg >=4.0
- flake8
- fpdf2
Expand Down Expand Up @@ -86,8 +88,8 @@ dependencies:
- ispyb
- isstools
- jedi
- julia
- juliaup
# - julia
# - juliaup
- jupyter
- jupyterlab
- larixite
Expand All @@ -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()
Expand All @@ -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
Expand All @@ -143,7 +146,6 @@ dependencies:
- pymatgen >=2024.5.1
- maggma >=0.66
- mp-api >=0.41.2
- pymca
- pymcr
- pymongo >=3.7
- pyobjcryst
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
27 changes: 15 additions & 12 deletions envs/env-py311.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2025-2.2-py311-tiled
name: 2025-3.0-py311-tiled
channels:
- conda-forge
dependencies:
Expand All @@ -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
Expand All @@ -43,7 +44,7 @@ dependencies:
- dask-jobqueue
- dask-ml
- dask-xgboost
- databroker >=2.0.0b64
- databroker >=2.0.0b68
- datview
- dictdiffer
- diffpy.pdffit2
Expand All @@ -58,6 +59,7 @@ dependencies:
- eiger-io
- event-model >=1.21
- fabio
- fastapi >=0.115.8
- ffmpeg >=4.0
- flake8
- fpdf2
Expand Down Expand Up @@ -86,8 +88,8 @@ dependencies:
- ispyb
- isstools
- jedi
- julia
- juliaup
# - julia
# - juliaup
- jupyter
- jupyterlab
- larixite
Expand All @@ -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()
Expand All @@ -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
Expand All @@ -143,7 +146,6 @@ dependencies:
- pymatgen >=2024.5.1
- maggma >=0.66
- mp-api >=0.41.2
- pymca
- pymcr
- pymongo >=3.7
- pyobjcryst
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading
Loading