Skip to content

Commit

Permalink
PR: Remove Mambaforge usage and update Linux setup (CI) (#511)
Browse files Browse the repository at this point in the history
  • Loading branch information
dalthviz authored Feb 11, 2025
1 parent 1d2a1ea commit 5ae2bd7
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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}

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 5ae2bd7

Please sign in to comment.