Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
e8a4452
Initial toml file
tacaswell Aug 26, 2025
66b23e0
Regenerate with current versions
tacaswell Aug 26, 2025
d807c6a
FIX: account for changes to Python stdlib
tacaswell Aug 28, 2025
706ff1e
Initial packages required to get profile to import
tacaswell Aug 28, 2025
44cb1e4
MNT: use raw strings for invalid string escapes
tacaswell Aug 29, 2025
efc292d
Add hdf5 plugins and standardize Python pinning
tacaswell Sep 3, 2025
590a669
update lockfile
tacaswell Sep 3, 2025
bcbf47e
Update lock file
tacaswell Sep 4, 2025
9963e48
update core pins
tacaswell Sep 4, 2025
a6e13f5
regenerate lock
tacaswell Sep 4, 2025
0aa203d
Update versions
tacaswell Sep 4, 2025
e21252e
Adding more third-party floors
tacaswell Sep 4, 2025
277db38
Remove accidental 'default' environment
tacaswell Sep 5, 2025
c15f034
Update versions
tacaswell Sep 5, 2025
cd67c0c
MNT: update ophyd-async and pull more from CF
tacaswell Sep 9, 2025
123c7ca
Manage envs when lanuching terminal
tacaswell Oct 22, 2025
6fe00a0
Update and regenerate lock
tacaswell Oct 22, 2025
576248b
MNT: change from deprecated section name
tacaswell Nov 7, 2025
25ae68a
Update pixi.toml for new packages
tacaswell Nov 7, 2025
a5fe158
BLD: update lock file
tacaswell Nov 7, 2025
689e927
Add pvxslibs
tacaswell Nov 17, 2025
16a51cf
Update pixi.toml for new packages
tacaswell Nov 17, 2025
ea53931
Trying out some testing ideas
thopkins32 Nov 21, 2025
fe2e691
Finished profile startup testing with mock backend
thopkins32 Nov 25, 2025
f2177a8
Move test down one level
thopkins32 Nov 25, 2025
2d03232
Added more assertions for important devices
thopkins32 Nov 25, 2025
2ba927f
Updated ci.yml
thopkins32 Nov 25, 2025
1c8a601
Update lock file
thopkins32 Nov 25, 2025
c798e34
Specify test environment
thopkins32 Nov 25, 2025
56cd8dd
Fix environment option
thopkins32 Nov 25, 2025
2aa1e73
Remove unused IOC directory
thopkins32 Nov 25, 2025
967f3fb
trigger CI
thopkins32 Nov 25, 2025
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
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# SCM syntax highlighting & preventing 3-way merges
pixi.lock merge=binary linguist-language=YAML linguist-generated=true
75 changes: 43 additions & 32 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,34 @@ on:
- main
pull_request:
workflow_dispatch:
workflow_call:
inputs:
version: # the variable you can use in place of a matrix
required: true
type: string
#workflow_call:
# inputs:
# version: # the variable you can use in place of a matrix
# required: true
# type: string

jobs:
testing_beamline_profiles:
name: ${{ matrix.repos.beamline-acronym }}-py${{ matrix.zenodo.python }}
strategy:
fail-fast: false
matrix:
repos:
- org: "NSLS2"
repo: "csx-profile-collection"
branch: ""
beamline-acronym: "csx"
zenodo:
- url: "https://zenodo.org/records/15636681/files/2025-2.2-py310-tiled.tar.gz"
md5: "3c9a3cb2fe30692c3cf71d92c03a359d"
python: "3.10"
- url: "https://zenodo.org/records/15636681/files/2025-2.2-py311-tiled.tar.gz"
md5: "346e39f6269f04cde26108c7eab3f989"
python: "3.11"
- url: "https://zenodo.org/records/15636681/files/2025-2.2-py312-tiled.tar.gz"
md5: "345b8e9eff936378a780c82214e7171d"
python: "3.12"
name: Test profile
# name: ${{ matrix.repos.beamline-acronym }}-py${{ matrix.zenodo.python }}
# strategy:
# fail-fast: false
# matrix:
# repos:
# - org: "NSLS2"
# repo: "csx-profile-collection"
# branch: ""
# beamline-acronym: "csx"
# zenodo:
# - url: "https://zenodo.org/records/15636681/files/2025-2.2-py310-tiled.tar.gz"
# md5: "3c9a3cb2fe30692c3cf71d92c03a359d"
# python: "3.10"
# - url: "https://zenodo.org/records/15636681/files/2025-2.2-py311-tiled.tar.gz"
# md5: "346e39f6269f04cde26108c7eab3f989"
# python: "3.11"
# - url: "https://zenodo.org/records/15636681/files/2025-2.2-py312-tiled.tar.gz"
# md5: "345b8e9eff936378a780c82214e7171d"
# python: "3.12"

runs-on: ubuntu-latest
steps:
Expand All @@ -43,12 +44,22 @@ jobs:
with:
persist-credentials: false

- name: Run Integration Tests Against Beamline Profiles
uses: NSLS2/[email protected]
- name: Setup Pixi
uses: prefix-dev/setup-pixi@82d477f15f3a381dbcc8adc1206ce643fe110fb7 # v0.9.3
with:
conda_env_url: "${{ matrix.zenodo.url }}"
conda_env_md5: "${{ matrix.zenodo.md5 }}"
org: "${{ matrix.repos.org }}"
repo: "${{ matrix.repos.repo }}"
branch: "${{ matrix.repos.branch }}"
beamline-acronym: "${{ matrix.repos.beamline-acronym }}"
pixi-version: v0.59.0
cache: false
environments: test

- name: Run pytest
run: pixi run test

#- name: Run Integration Tests Against Beamline Profiles
# uses: NSLS2/[email protected]
# with:
# conda_env_url: "${{ matrix.zenodo.url }}"
# conda_env_md5: "${{ matrix.zenodo.md5 }}"
# org: "${{ matrix.repos.org }}"
# repo: "${{ matrix.repos.repo }}"
# branch: "${{ matrix.repos.branch }}"
# beamline-acronym: "${{ matrix.repos.beamline-acronym }}"
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -144,3 +144,6 @@ target/
dump.rdb

**/auto-generated/
# pixi environments
.pixi/*
!.pixi/config.toml
5 changes: 0 additions & 5 deletions iocs/csx-epics-containers/.copier-answers.yml

This file was deleted.

17 changes: 0 additions & 17 deletions iocs/csx-epics-containers/.env

This file was deleted.

135 changes: 0 additions & 135 deletions iocs/csx-epics-containers/README.md

This file was deleted.

50 changes: 0 additions & 50 deletions iocs/csx-epics-containers/compose.yaml

This file was deleted.

48 changes: 0 additions & 48 deletions iocs/csx-epics-containers/environment.sh

This file was deleted.

18 changes: 0 additions & 18 deletions iocs/csx-epics-containers/include/init.sh

This file was deleted.

Loading