Skip to content

Commit 7adc531

Browse files
committed
chore: restore pixi 0.67.2 version to fix the CI for now
1 parent f7e0a3a commit 7adc531

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

.github/workflows/basic.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,9 @@ jobs:
171171
path: diracx
172172
- uses: prefix-dev/setup-pixi@v0.9.3
173173
with:
174+
# Pinned to dodge multiple 0.68.x regressions (`--no-install` semantics
175+
# change, lockfile-v7 false positives). Bump when those are resolved.
176+
pixi-version: v0.67.2
174177
run-install: false
175178
post-cleanup: false
176179
- name: Apply workarounds
@@ -180,14 +183,15 @@ jobs:
180183
sed -i.bak 's@editable = true@editable = false@g' pixi.toml
181184
rm pixi.toml.bak
182185
# Add annotations to github actions
183-
pixi add --pypi --feature diracx-core pytest-github-actions-annotate-failures
186+
pixi add --no-install --pypi --feature diracx-core pytest-github-actions-annotate-failures
184187
# Add the current DIRAC clone to the pixi.toml
185-
pixi add --pypi --feature diracx-core 'DIRACCommon @ file://'$PWD'/../DIRAC/dirac-common'
186-
pixi add --pypi --feature diracx-core 'DIRAC @ file://'$PWD'/../DIRAC'
188+
pixi add --no-install --pypi --feature diracx-core 'DIRACCommon @ file://'$PWD'/../DIRAC/dirac-common'
189+
pixi add --no-install --pypi --feature diracx-core 'DIRAC @ file://'$PWD'/../DIRAC'
187190
# Show any changes
188191
git diff
189192
- uses: prefix-dev/setup-pixi@v0.9.3
190193
with:
194+
pixi-version: v0.67.2
191195
cache: false
192196
manifest-path: diracx/pixi.toml
193197
environments: >-

docs/docs.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ no_inherited_members =
3131
DIRAC.Core.Utilities.Graphs.GraphUtilities,
3232
DIRAC.DataManagementSystem.private.HttpStorageAccessHandler,
3333
DIRAC.FrameworkSystem.private.standardLogging.LogLevels,
34+
DIRAC.Resources.IdProvider.OAuth2IdProvider,
35+
DIRAC.Resources.IdProvider.CheckInIdProvider,
36+
DIRAC.Resources.IdProvider.IAMIdProvider,
3437

3538
# only creating dummy files, because they cannot be safely imported due to sideEffects
3639
create_dummy_files = lfc_dfc_copy, lfc_dfc_db_copy, JobWrapperTemplate, JobWrapperOfflineTemplate

0 commit comments

Comments
 (0)