Skip to content

Commit ba7896d

Browse files
authored
Merge branch 'main' into rmq-out-small-step-try
2 parents eb34d37 + d17c293 commit ba7896d

File tree

3 files changed

+80
-110
lines changed

3 files changed

+80
-110
lines changed

.github/workflows/ci-code.yml

-3
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,9 @@ jobs:
7676
AIIDA_WARN_v3: 1
7777
# NOTE1: Python 3.12 has a performance regression when running with code coverage
7878
# so run code coverage only for python 3.9.
79-
# NOTE2: Unset CI envvar to workaround a pymatgen issue for Python 3.9
80-
# https://github.com/materialsproject/pymatgen/issues/4243
8179
# TODO: Remove a workaround for VIRTUAL_ENV once the setup-uv action is updated
8280
# https://github.com/astral-sh/setup-uv/issues/219
8381
run: |
84-
${{ matrix.python-version == '3.9' && 'unset CI' || '' }}
8582
${{ matrix.python-version == '3.9' && 'VIRTUAL_ENV=$PWD/.venv' || '' }}
8683
pytest -n auto --db-backend ${{ matrix.database-backend }} -m 'not nightly' tests/ ${{ matrix.python-version == '3.9' && '--cov aiida' || '' }}
8784

.github/workflows/test-install.yml

-3
Original file line numberDiff line numberDiff line change
@@ -211,11 +211,8 @@ jobs:
211211
env:
212212
AIIDA_TEST_PROFILE: test_aiida
213213
AIIDA_WARN_v3: 1
214-
# Unset CI envvar to workaround a pymatgen issue for Python 3.9
215-
# https://github.com/materialsproject/pymatgen/issues/4243
216214
# TODO: Remove a workaround for VIRTUAL_ENV once the setup-uv action is updated
217215
# https://github.com/astral-sh/setup-uv/issues/219
218216
run: |
219-
${{ matrix.python-version == '3.9' && 'unset CI' || '' }}
220217
${{ matrix.python-version == '3.9' && 'VIRTUAL_ENV=$PWD/.venv' || '' }}
221218
pytest -n auto --db-backend psql -m 'not nightly' tests/

0 commit comments

Comments
 (0)