Skip to content

Commit 5ae2bd7

Browse files
authored
PR: Remove Mambaforge usage and update Linux setup (CI) (#511)
1 parent 1d2a1ea commit 5ae2bd7

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -130,23 +130,23 @@ jobs:
130130
shell: bash
131131
run: |
132132
sudo apt update
133-
sudo apt install libpulse-dev libegl1-mesa libopengl0 gstreamer1.0-gl
133+
sudo apt install libpulse-dev libegl1-mesa-dev libopengl0 gstreamer1.0-gl
134134
- uses: tlambert03/setup-qt-libs@v1
135135
- name: Install Conda
136-
uses: conda-incubator/setup-miniconda@v2
136+
uses: conda-incubator/setup-miniconda@v3
137137
with:
138138
activate-environment: ''
139139
auto-activate-base: true
140140
auto-update-conda: true
141141
channels: conda-forge
142+
conda-remove-defaults: true
142143
channel-priority: strict
143-
miniforge-variant: Mambaforge
144-
use-mamba: true
144+
miniforge-version: latest
145145
- name: Print Conda info
146-
shell: bash -l {0}
146+
shell: bash -el {0}
147147
run: |
148-
mamba info
149-
mamba list
148+
conda info
149+
conda list
150150
- name: Test PyQt5
151151
if: (! matrix.skip-pyqt5)
152152
run: ./.github/workflows/test.sh pyqt5

.github/workflows/test.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
eval "$(conda shell.bash hook)"
44

5-
# Create and activate mamba environment for this test
5+
# Create and activate conda environment for this test
66
BINDING=$(echo "$1" | tr '[:lower:]' '[:upper:]')
77
QT_VERSION_VAR=${BINDING}_QT_VERSION
88

@@ -27,7 +27,7 @@ if [ "$USE_CONDA" = "Yes" ]; then
2727

2828
fi
2929

30-
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:-}
30+
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:-}
3131

3232
conda activate test-env-${BINDING}
3333

@@ -91,7 +91,7 @@ python -bb -X dev -W error -m build
9191
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 %
9292

9393
# Print environment information
94-
mamba list
94+
conda list
9595

9696
# Run tests
9797
python -I -bb -X dev -W error -m pytest --cov qtpy --cov-config .coveragerc --cov-append

0 commit comments

Comments
 (0)