From 5ae2bd73cf120757c727cd10e81b28304683e1e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Althviz=20Mor=C3=A9?= <16781833+dalthviz@users.noreply.github.com> Date: Mon, 10 Feb 2025 21:12:20 -0500 Subject: [PATCH] PR: Remove `Mambaforge` usage and update Linux setup (CI) (#511) --- .github/workflows/ci.yml | 14 +++++++------- .github/workflows/test.sh | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5a1ddff6..e5326342 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -130,23 +130,23 @@ jobs: shell: bash run: | sudo apt update - sudo apt install libpulse-dev libegl1-mesa libopengl0 gstreamer1.0-gl + sudo apt install libpulse-dev libegl1-mesa-dev libopengl0 gstreamer1.0-gl - uses: tlambert03/setup-qt-libs@v1 - name: Install Conda - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v3 with: activate-environment: '' auto-activate-base: true auto-update-conda: true channels: conda-forge + conda-remove-defaults: true channel-priority: strict - miniforge-variant: Mambaforge - use-mamba: true + miniforge-version: latest - name: Print Conda info - shell: bash -l {0} + shell: bash -el {0} run: | - mamba info - mamba list + conda info + conda list - name: Test PyQt5 if: (! matrix.skip-pyqt5) run: ./.github/workflows/test.sh pyqt5 diff --git a/.github/workflows/test.sh b/.github/workflows/test.sh index bd287eb0..23d036cc 100755 --- a/.github/workflows/test.sh +++ b/.github/workflows/test.sh @@ -2,7 +2,7 @@ eval "$(conda shell.bash hook)" -# Create and activate mamba environment for this test +# Create and activate conda environment for this test BINDING=$(echo "$1" | tr '[:lower:]' '[:upper:]') QT_VERSION_VAR=${BINDING}_QT_VERSION @@ -27,7 +27,7 @@ if [ "$USE_CONDA" = "Yes" ]; then fi -mamba create -y -n test-env-${BINDING} python=${PYTHON_VERSION} pytest${PYTEST_VERSION:->=6,!=7.0.0,!=7.0.1} pytest-cov>=3.0.0 pytest-qt${PYTESTQT_VERSION:-} ${QT_SPECS:-} +conda create -y -n test-env-${BINDING} python=${PYTHON_VERSION} pytest${PYTEST_VERSION:->=6,!=7.0.0,!=7.0.1} pytest-cov>=3.0.0 pytest-qt${PYTESTQT_VERSION:-} ${QT_SPECS:-} conda activate test-env-${BINDING} @@ -91,7 +91,7 @@ python -bb -X dev -W error -m build echo dist/*.whl | xargs -I % python -bb -X dev -W error -W "ignore::DeprecationWarning:pip._internal.locations._distutils" -W "ignore::DeprecationWarning:distutils.command.install" -W "ignore::DeprecationWarning:pip._internal.metadata.importlib._envs" -m pip install --upgrade % # Print environment information -mamba list +conda list # Run tests python -I -bb -X dev -W error -m pytest --cov qtpy --cov-config .coveragerc --cov-append