From 68342827dd85d544a3092ef3ff278dce3e45bfcd Mon Sep 17 00:00:00 2001 From: Max Rakitin Date: Thu, 20 Jun 2024 16:06:34 -0400 Subject: [PATCH 01/13] 2024-2.1-py311-tiled env --- .github/workflows/package.yml | 2 +- configs/config-py311.yml | 4 ++-- envs/env-py311.yml | 23 +++++++++++++---------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index f256ce2..f0b8135 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.10", "3.11"] + python-version: ["3.11"] fail-fast: false env: TZ: America/New_York diff --git a/configs/config-py311.yml b/configs/config-py311.yml index 1400664..e4fed3c 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: "2024-2.0-py311-tiled" +env_name: "2024-2.1-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: 2024-2.0-tiled + version: 2024-2.1-tiled creators: - name: Rakitin, Max affiliation: "Brookhaven National Laboratory" diff --git a/envs/env-py311.yml b/envs/env-py311.yml index fa61380..46b5dd0 100644 --- a/envs/env-py311.yml +++ b/envs/env-py311.yml @@ -1,4 +1,4 @@ -name: 2024-2.0-py311-tiled +name: 2024-2.1-py311-tiled channels: - conda-forge dependencies: @@ -18,6 +18,7 @@ dependencies: - awkward - black - blosc-hdf5-plugin + # - bluesky >=1.13.0a3 - bluesky-adaptive >=0.3.1 - bluesky-kafka >=0.10.0 - bluesky-live >=0.0.8 @@ -27,7 +28,7 @@ dependencies: - bokeh - boto3 - bottleneck - - broh5 + # - broh5 - chxtools - cmasher - conda-pack @@ -35,12 +36,12 @@ dependencies: - csxtools >=0.2.1 - dash - dash-bootstrap-components - - dask + - dask >=2023.9.0 - dask-image - dask-jobqueue - dask-ml - dask-xgboost - - databroker >=2.0.0b38 + - databroker >=2.0.0b45 - dictdiffer - discorpy - distributed @@ -120,9 +121,11 @@ dependencies: - py4xs - pycentroids - pyepics >=3.4.2 - - pyfai + - pyfai >=2024.5.0 - pyfftw - - pymatgen >=2023.6.28 + - pymatgen >=2024.5.1 + - maggma >=0.66 + - mp-api >=0.41.2 - pymca - pymcr - pymongo >=3.7 @@ -133,7 +136,7 @@ dependencies: - python-blosc - python-graphviz - python-pptx - - pyxrf >=1.0.24 + - pyxrf >=1.0.28 - pyzbar - qt >=5.15.0 - redis-dict @@ -160,6 +163,7 @@ dependencies: - suitcase-tiff >=0.4.0 - suitcase-utils - sympy + - tiled >=0.1.0b4 - toml - tomopy >=1.12.2 - tornado @@ -177,7 +181,7 @@ dependencies: - srwpy >=4.1.0 - sirepo-bluesky >=0.6.2 - xrt - - zict <3.0.0 + - zict - pipx - pip - pip: @@ -187,13 +191,12 @@ dependencies: - ophyd-async[ca,pva] - pyhyperscattering[all] - redis-json-dict - - tiled[all] >=0.1.0a120 #***************************************************************************# # # # Dependencies from the `nsls2-collection` metapackage # # # #***************************************************************************# - - bloptools >=0.6.1 + - bloptools >=0.7.0 - bluesky-darkframes >=0.6.0 - caproto - emojis From 97ffc747a19a16fe1c6f0755024d85e4ccee57a0 Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Thu, 20 Jun 2024 19:44:19 -0400 Subject: [PATCH 02/13] Add packages needed for XPD --- envs/env-py311.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/envs/env-py311.yml b/envs/env-py311.yml index 46b5dd0..be427bf 100644 --- a/envs/env-py311.yml +++ b/envs/env-py311.yml @@ -43,6 +43,8 @@ dependencies: - dask-xgboost - databroker >=2.0.0b45 - dictdiffer + - diffpy.pdffit2 + - diffpy.structure - discorpy - distributed - doi2bib @@ -129,6 +131,7 @@ dependencies: - pymca - pymcr - pymongo >=3.7 + - pyobjcryst - pypdf2 - pyqt >=5.15.0 - pyqtgraph From dd52626f040864cb79a98309516c2cc86a9af8e2 Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Thu, 20 Jun 2024 20:19:58 -0400 Subject: [PATCH 03/13] 2024-2.1-py310-tiled env --- .github/workflows/package.yml | 2 +- configs/config-py310.yml | 4 ++-- envs/env-py310.yml | 33 +++++++++++++++------------------ 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index f0b8135..f256ce2 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.11"] + python-version: ["3.10", "3.11"] fail-fast: false env: TZ: America/New_York diff --git a/configs/config-py310.yml b/configs/config-py310.yml index 60927f2..a05bbd5 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: "2024-2.0-py310-tiled" +env_name: "2024-2.1-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: 2024-2.0-tiled + version: 2024-2.1-tiled creators: - name: Rakitin, Max affiliation: "Brookhaven National Laboratory" diff --git a/envs/env-py310.yml b/envs/env-py310.yml index b103ebb..0348786 100644 --- a/envs/env-py310.yml +++ b/envs/env-py310.yml @@ -1,12 +1,25 @@ -name: 2024-2.0-py310-tiled +name: 2024-2.1-py310-tiled channels: - conda-forge dependencies: # Loose dependencies: - analysisstore >=0.0.6 + - bloptools >=0.7.0 - blosc-hdf5-plugin - conftrak >=0.0.9 + - dask >=2023.9.0 + - databroker >=2.0.0b45 + - diffpy.pdffit2 + - diffpy.structure - hdf5-external-filter-plugins + - maggma >=0.66 + - mp-api >=0.41.2 + - pyfai >=2024.5.0 + - pymatgen >=2024.5.1 + - pyobjcryst + - pyxrf >=1.0.28 + - tiled >=0.1.0b4 + - zict # Dependencies with exact pins: - _libgcc_mutex=0.1=conda_forge - _openmp_mutex=4.5=2_kmp_llvm @@ -89,9 +102,7 @@ dependencies: - black=24.4.2=py310hff52083_0 - bleach=6.1.0=pyhd8ed1ab_0 - blinker=1.8.1=pyhd8ed1ab_0 - - bloptools=0.6.1=pyhd8ed1ab_0 - blosc=1.21.5=h0f2a231_0 - - bluesky=1.13.0a3=pyha770c72_0 - bluesky-adaptive=0.3.1=pyhd8ed1ab_0 - bluesky-base=1.13.0a3=pyhd8ed1ab_0 - bluesky-darkframes=0.6.0=pyhd8ed1ab_0 @@ -164,14 +175,11 @@ dependencies: - cytoolz=0.12.3=py310h2372a71_0 - dash=2.16.1=pyhd8ed1ab_0 - dash-bootstrap-components=1.6.0=pyhd8ed1ab_0 - - dask=2023.8.1=pyhd8ed1ab_0 - - dask-core=2023.8.1=pyhd8ed1ab_0 - dask-glm=0.3.2=pyhd8ed1ab_0 - dask-image=2023.8.1=pyhd8ed1ab_0 - dask-jobqueue=0.8.5=pyhd8ed1ab_0 - dask-ml=2024.3.20=pyhd8ed1ab_0 - dask-xgboost=0.1.11=pyh9f0ad1d_0 - - databroker=2.0.0b40=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - dateparser=1.2.0=pyhd8ed1ab_0 - dav1d=1.2.1=hd590300_0 @@ -487,7 +495,6 @@ dependencies: - lz4=4.3.3=py310h350c4a5_0 - lz4-c=1.9.4=hcb278e6_0 - lzo=2.10=hd590300_1001 - - maggma=0.46.1=pyhd8ed1ab_0 - magicgui=0.8.2=pyhd8ed1ab_1 - mako=1.3.3=pyhd8ed1ab_0 - manhole=1.8.0=pyhd8ed1ab_4 @@ -514,7 +521,6 @@ dependencies: - mongoquery=1.4.2=pyhd8ed1ab_0 - monty=2024.4.17=pyhd8ed1ab_0 - more-itertools=10.2.0=pyhd8ed1ab_0 - - mp-api=0.37.2=pyhd8ed1ab_0 - mpc=1.3.1=hfe3b2da_0 - mpfr=4.2.1=h9458935_1 - mpg123=1.32.6=h59595ed_0 @@ -683,8 +689,6 @@ dependencies: - pyepics=3.5.2=py310hff52083_2 - pyerfa=2.0.1.4=py310h1f7b6fc_0 - pyface=8.0.0=pyhd8ed1ab_0 - - pyfai=2024.2.0=hd8ed1ab_1 - - pyfai-base=2024.2.0=py310hcc13569_1 - pyfftw=0.13.1=py310h0a54255_0 - pyfiglet=0.8.post1=py_0 - pyflakes=3.2.0=pyhd8ed1ab_0 @@ -694,7 +698,6 @@ dependencies: - pyinstrument=4.6.2=py310h2372a71_0 - pyjwt=2.8.0=pyhd8ed1ab_1 - pylatexenc=2.10=pyhd8ed1ab_0 - - pymatgen=2024.4.13=py310h1f7b6fc_0 - pymca=5.9.1=py310h1f7b6fc_1 - pymcr=0.5.1=pyhd8ed1ab_0 - pymongo=4.6.3=py310hc6cd4ac_0 @@ -752,7 +755,6 @@ dependencies: - pywavelets=1.4.1=py310h1f7b6fc_1 - pywin32-on-windows=0.1.0=pyh1179c8e_3 - pyxdameraulevenshtein=1.7.1=py310h1f7b6fc_2 - - pyxrf=1.0.27=pyhd8ed1ab_0 - pyyaml=6.0.1=py310h2372a71_1 - pyzbar=0.1.9=pyhd8ed1ab_0 - pyzenodo3=1.0.2=py_0 @@ -878,11 +880,6 @@ dependencies: - tfs-pandas=3.7.3=pyhd8ed1ab_0 - threadpoolctl=3.5.0=pyhc1e730c_0 - tifffile=2024.4.18=pyhd8ed1ab_0 - - tiled=0.1.0a120=hd8ed1ab_0 - - tiled-base=0.1.0a120=pyhd8ed1ab_0 - - tiled-client=0.1.0a120=hd8ed1ab_0 - - tiled-formats=0.1.0a120=hd8ed1ab_0 - - tiled-server=0.1.0a120=hd8ed1ab_0 - tiledb=2.16.3=hf0b6e87_3 - tinycss2=1.3.0=pyhd8ed1ab_0 - tk=8.6.13=noxft_h4845f30_101 @@ -1008,13 +1005,13 @@ dependencies: - zbar=0.10=h4530518_1001 - zeromq=4.3.5=h59595ed_1 - zfp=1.0.1=h59595ed_0 - - zict=2.2.0=pyhd8ed1ab_0 - zipp=3.17.0=pyhd8ed1ab_0 - zlib=1.2.13=hd590300_5 - zlib-ng=2.0.7=h0b41bf4_0 - zstandard=0.22.0=py310h1275a96_0 - zstd=1.5.5=hfc55251_0 - pip: + - bluesky>=1.13.0a3 - aioca==1.7 - aiofiles==22.1.0 - altair==5.3.0 From 50d19b1c6b78baf94062662da60f1acfa5c47348 Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Thu, 20 Jun 2024 20:25:20 -0400 Subject: [PATCH 04/13] Resolve py310 conflicts --- envs/env-py310.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/envs/env-py310.yml b/envs/env-py310.yml index 0348786..4f5219a 100644 --- a/envs/env-py310.yml +++ b/envs/env-py310.yml @@ -8,6 +8,7 @@ dependencies: - blosc-hdf5-plugin - conftrak >=0.0.9 - dask >=2023.9.0 + - distributed >=2023.9.0 - databroker >=2.0.0b45 - diffpy.pdffit2 - diffpy.structure @@ -119,7 +120,7 @@ dependencies: - botorch=0.10.0=pyhd8ed1ab_0 - bottleneck=1.3.8=py310h1f7b6fc_0 - bqplot=0.12.43=pyhd8ed1ab_0 - - broh5=1.1.0=pyhd8ed1ab_2 + # - broh5=1.1.0=pyhd8ed1ab_2 - brotli=1.0.9=h166bdaf_9 - brotli-bin=1.0.9=h166bdaf_9 - brotli-python=1.0.9=py310hd8f1fbe_9 @@ -191,7 +192,6 @@ dependencies: - dill=0.3.8=pyhd8ed1ab_0 - discorpy=1.6.0=pyhd8ed1ab_0 - distlib=0.3.8=pyhd8ed1ab_0 - - distributed=2023.8.1=pyhd8ed1ab_0 - distro=1.9.0=pyhd8ed1ab_0 - dnspython=2.4.2=pyhd8ed1ab_0 - docker-py=6.1.3=pyhd8ed1ab_0 @@ -558,7 +558,7 @@ dependencies: - networkx=3.3=pyhd8ed1ab_1 - nexpy=1.0.7=pyhd8ed1ab_0 - nexusformat=1.0.4=pyhd8ed1ab_0 - - nicegui=1.4.9=pyhd8ed1ab_0 + # - nicegui=1.4.9=pyhd8ed1ab_0 - nlohmann_json=3.11.3=h59595ed_0 - nng=1.6.0=h59595ed_3 - nodeenv=1.8.0=pyhd8ed1ab_0 From eb8485fea99bd6f98cf2797f78515011cc2b3785 Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Thu, 20 Jun 2024 20:31:08 -0400 Subject: [PATCH 05/13] More cleanup for py310 --- envs/env-py310.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/envs/env-py310.yml b/envs/env-py310.yml index 4f5219a..14013fa 100644 --- a/envs/env-py310.yml +++ b/envs/env-py310.yml @@ -105,7 +105,6 @@ dependencies: - blinker=1.8.1=pyhd8ed1ab_0 - blosc=1.21.5=h0f2a231_0 - bluesky-adaptive=0.3.1=pyhd8ed1ab_0 - - bluesky-base=1.13.0a3=pyhd8ed1ab_0 - bluesky-darkframes=0.6.0=pyhd8ed1ab_0 - bluesky-kafka=0.10.0=pyhd8ed1ab_0 - bluesky-live=0.0.8=pyhd8ed1ab_0 From 75c294dcd85e34247bbd643542b57414ea79739a Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Thu, 20 Jun 2024 20:33:00 -0400 Subject: [PATCH 06/13] Even more cleanup for py310 --- envs/env-py310.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/envs/env-py310.yml b/envs/env-py310.yml index 14013fa..3a36b29 100644 --- a/envs/env-py310.yml +++ b/envs/env-py310.yml @@ -812,7 +812,6 @@ dependencies: - simple-websocket=1.0.0=pyhd8ed1ab_1 - simplejson=3.19.2=py310h2372a71_0 - sip=6.7.12=py310hc6cd4ac_0 - - sirepo-bluesky=0.7.2=pyhd8ed1ab_0 - six=1.16.0=pyh6c4a22f_0 - sixtools=0.0.3=pyhd8ed1ab_0 - slack-sdk=3.27.1=pyha770c72_0 From 507995879c81bc0951b0f3d6ddd50b5ec509ba1f Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Thu, 20 Jun 2024 20:44:33 -0400 Subject: [PATCH 07/13] Add py312 config --- .github/workflows/package.yml | 2 +- configs/config-py312.yml | 27 ++++ envs/env-py312.yml | 235 ++++++++++++++++++++++++++++++++++ 3 files changed, 263 insertions(+), 1 deletion(-) create mode 100644 configs/config-py312.yml create mode 100644 envs/env-py312.yml diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index f256ce2..d0decbb 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.10", "3.11"] + python-version: ["3.10", "3.11", "3.12"] fail-fast: false env: TZ: America/New_York diff --git a/configs/config-py312.yml b/configs/config-py312.yml new file mode 100644 index 0000000..3286d71 --- /dev/null +++ b/configs/config-py312.yml @@ -0,0 +1,27 @@ +docker_image: "quay.io/condaforge/linux-anvil-cos7-x86_64:latest" +env_name: "2024-2.1-py312-tiled" +conda_env_file: "env-py312.yml" +conda_binary: "mamba" +python_version: "3.12" +pkg_name: "" +pkg_version: "" +extra_packages: "mamba" +channels: "-c conda-forge" +extra_cmd_before_install: "yum install mesa-libGL -y" +extra_cmd_after_install: "conda remove perl --force -y" +docker_upload: + - ghcr + - dockerhub + # - quay +zenodo_upload: "no" +zenodo_metadata: + metadata: + title: "NSLS-II collection conda environment" + upload_type: "software" + description: "NSLS-II collection conda environment" + version: 2024-2.1-tiled + creators: + - name: Rakitin, Max + affiliation: "Brookhaven National Laboratory" + - name: Bischof, Garrett + affiliation: "Brookhaven National Laboratory" diff --git a/envs/env-py312.yml b/envs/env-py312.yml new file mode 100644 index 0000000..2aa3039 --- /dev/null +++ b/envs/env-py312.yml @@ -0,0 +1,235 @@ +name: 2024-2.1-py312-tiled +channels: + - conda-forge +dependencies: + #***************************************************************************# + # # + # Dependencies from the `nsls2-analysis` metapackage # + # # + #***************************************************************************# + - python >=3.12,<3.13 + - algotom + - amostra <=1.0 + - analysisstore >=0.0.6 + # - ansiwrap + - area-detector-handlers >=0.0.9 + - arvpyf + - attrs >=18.0 + - awkward + - black + - blosc-hdf5-plugin + # - bluesky >=1.13.0a3 + - 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-widgets >=0.0.15 + - bokeh + - boto3 + - bottleneck + # - broh5 + - chxtools + - cmasher + - conda-pack + - conftrak >=0.0.9 + - csxtools >=0.2.1 + - dash + - dash-bootstrap-components + - dask >=2023.9.0 + - dask-image + - dask-jobqueue + - dask-ml + - dask-xgboost + - databroker >=2.0.0b45 + - dictdiffer + - diffpy.pdffit2 + - diffpy.structure + - discorpy + - distributed + - doi2bib + - dpcmaps + # - edrixs # conflicts caused by the latest numexpr, to resolve later. + - eiger-io + - event-model >=1.20 + - fabio + - ffmpeg >=4.0 + - flake8 + - fpdf2 + - globus-sdk + - graphviz + - grid-strategy + - h5py !=3.4 + - hdf5-external-filter-plugins + - hextools >=0.1.3 + - historydict + - hvplot + - hxntools >=0.6.1 + - igor + - imageio + - inflection + - ipyaggrid + - ipydatagrid + - ipykernel + - ipympl >=0.1.1 + - ipython >=7.20.0 + - ipywidgets >=7.2.1 + - isort + - ispyb + - isstools + - jedi + - jupyter + - jupyterlab + - ldap3 + - legacy-suitcase + - lixtools + - lmfit + - lxml + - matplotlib >=3.6.2 + - memory_profiler + - mendeleev + - modestimage + - mxtools >=1.0.3 + - napari >=0.4.17 + - natsort + - netcdf4 + - nexpy >=1.0.7 + - nodejs + - nsls2-detector-handlers >=0.0.3 + - nslsii >=0.9.1 + - numexpr >=2.8.0 + - numpy >=1.20 + - nyxtools >=0.0.12 + - oct2py + - opencv + - openmpi >=4.1.4 + - ophyd >=1.8.0 + # pandas and deps + - pandas + - openpyxl # used by pandas .to_excel() + - pyarrow # >=14.0.1 # used by pandas .to_parquet() + - pytables # used by pandas .to_hdf() + # end of pandas deps + - papermill + - pdfstream ==0.5.2 # same as in the 2022-2.0-py37 env, https://zenodo.org/records/6462525/files/2022-2.0-py37.yml + - peakutils + - periodictable + - photutils + - pillow + - pocl # needed by pyopencl, used by the `xrt` package + - pre-commit + - prefect >=2.7 + - py-xgboost + - py4xs + - pycentroids + - pyepics >=3.4.2 + - pyfai >=2024.5.0 + - pyfftw + - pymatgen >=2024.5.1 + - maggma >=0.66 + - mp-api >=0.41.2 + - pymca + - pymcr + - pymongo >=3.7 + - pyobjcryst + - pypdf2 + - pyqt >=5.15.0 + - pyqtgraph + - pystackreg + - python-blosc + - python-graphviz + - python-pptx + - pyxrf >=1.0.28 + - pyzbar + - qt >=5.15.0 + - redis-dict + # - redis-json-dict + - redis-py + - reportlab + - requests + # - sasview # does not work with pyqt>=5.15 + - scikit-beam >=0.0.24 + - scikit-learn + - scipy >=1.9 + - seaborn + - silx + - sixtools + - slackclient + - smi-analysis + - sqlalchemy >=2.0.20 + - suitcase-csv + - suitcase-json-metadata + - suitcase-jsonl + - suitcase-mongo >=0.6.0 + - suitcase-msgpack + - suitcase-specfile + - suitcase-tiff >=0.4.0 + - suitcase-utils + - sympy + - tiled >=0.1.0b4 + - toml + - tomopy >=1.12.2 + - tornado + - tqdm + - tzlocal !=3.0 + - xlrd + - xlwt + - xmidas >=0.1.2 + - xray-vision >=0.1.1 + - xraylarch >=0.9.66 + - zbar # dependency of pyzbar + # Simulation packages: + - oscars + # - shadow3 >=23.1.4 + - srwpy >=4.1.0 + # - sirepo-bluesky >=0.6.2 + - xrt + - zict + - pipx + - pip + - pip: + - ansiwrap + - bluesky >=1.13.0a3 + - bloptools >=0.7.0 + - digautoprofiler + - mimesis + - ophyd-async[ca,pva] + - pyhyperscattering[all] + - redis-json-dict + #***************************************************************************# + # # + # Dependencies from the `nsls2-collection` metapackage # + # # + #***************************************************************************# + - bluesky-darkframes >=0.6.0 + - caproto + - emojis + - happi + - pexpect + # - pydm + - pyolog >=4.5.0 + - pyserial + - python-confluent-kafka + - pyzenodo3 + - simple-pid + - slack-sdk + # Beamline-specific packages + - hklpy # [linux] + - hxnfly >=0.0.11 + - kkcalc + - ppmac + - pychx >=4.3.0 + - xpdacq ==1.0.0 + # Debugging tools: + - hunter + - logging_tree + # Profiling tools: + - line_profiler + - pyinstrument + - pyperformance + # ML: + - botorch + - gpytorch + # - ortools-python + - pytorch + - scikit-optimize From 9d561e82a2d90cb857f86dd7f82de383984fca6e Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Thu, 20 Jun 2024 20:49:49 -0400 Subject: [PATCH 08/13] Comment-out pyfftw --- envs/env-py312.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envs/env-py312.yml b/envs/env-py312.yml index 2aa3039..d4e219e 100644 --- a/envs/env-py312.yml +++ b/envs/env-py312.yml @@ -124,7 +124,7 @@ dependencies: - pycentroids - pyepics >=3.4.2 - pyfai >=2024.5.0 - - pyfftw + # - pyfftw # no build for py312 as of 2024-06-20 - pymatgen >=2024.5.1 - maggma >=0.66 - mp-api >=0.41.2 From 021cd4ac0bf1b008d7e4a96f35a39b119c21426e Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Thu, 20 Jun 2024 21:00:07 -0400 Subject: [PATCH 09/13] Need numpy.distutils --- envs/env-py312.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envs/env-py312.yml b/envs/env-py312.yml index d4e219e..fed3287 100644 --- a/envs/env-py312.yml +++ b/envs/env-py312.yml @@ -98,7 +98,7 @@ dependencies: - nsls2-detector-handlers >=0.0.3 - nslsii >=0.9.1 - numexpr >=2.8.0 - - numpy >=1.20 + - numpy >=1.20,<1.25 - nyxtools >=0.0.12 - oct2py - opencv From e32b833092efe3799057995ef822ccff650f77e9 Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Thu, 20 Jun 2024 21:02:17 -0400 Subject: [PATCH 10/13] Numpy <1.26 --- envs/env-py312.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envs/env-py312.yml b/envs/env-py312.yml index fed3287..d78f10a 100644 --- a/envs/env-py312.yml +++ b/envs/env-py312.yml @@ -98,7 +98,7 @@ dependencies: - nsls2-detector-handlers >=0.0.3 - nslsii >=0.9.1 - numexpr >=2.8.0 - - numpy >=1.20,<1.25 + - numpy >=1.20,<1.26 - nyxtools >=0.0.12 - oct2py - opencv From 8a0018476f01cedb23acdc18891c194b3e068aa1 Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Thu, 20 Jun 2024 21:27:59 -0400 Subject: [PATCH 11/13] Exclude p4p/ophyd-async[pva] from py312 --- envs/env-py312.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envs/env-py312.yml b/envs/env-py312.yml index d78f10a..3a0813d 100644 --- a/envs/env-py312.yml +++ b/envs/env-py312.yml @@ -193,7 +193,7 @@ dependencies: - bloptools >=0.7.0 - digautoprofiler - mimesis - - ophyd-async[ca,pva] + - ophyd-async[ca] - pyhyperscattering[all] - redis-json-dict #***************************************************************************# From c907bdada6089f6599b74fcf9f3f970a1ad0d0f8 Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Thu, 20 Jun 2024 21:33:46 -0400 Subject: [PATCH 12/13] Numpy w/o upper pin --- envs/env-py312.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envs/env-py312.yml b/envs/env-py312.yml index 3a0813d..7e39f30 100644 --- a/envs/env-py312.yml +++ b/envs/env-py312.yml @@ -98,7 +98,7 @@ dependencies: - nsls2-detector-handlers >=0.0.3 - nslsii >=0.9.1 - numexpr >=2.8.0 - - numpy >=1.20,<1.26 + - numpy >=1.20 - nyxtools >=0.0.12 - oct2py - opencv From f4e60164cd5a5594cf8c6d825ef8228e42737783 Mon Sep 17 00:00:00 2001 From: Max Rakitin Date: Fri, 21 Jun 2024 10:57:24 -0400 Subject: [PATCH 13/13] Comment out `ophyd-async` for now as `p4p` is not available for Python 3.12 at the moment --- envs/env-py312.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envs/env-py312.yml b/envs/env-py312.yml index 7e39f30..bb6ae58 100644 --- a/envs/env-py312.yml +++ b/envs/env-py312.yml @@ -193,7 +193,7 @@ dependencies: - bloptools >=0.7.0 - digautoprofiler - mimesis - - ophyd-async[ca] + # - ophyd-async[ca] - pyhyperscattering[all] - redis-json-dict #***************************************************************************#