Merge branch 'GraphicalExecutionHistory' of https://github.com/jsbaut…

…ista/qtconsole into GraphicalExecutionHistory
jupyter · Jan 6, 2025 · 18e9b70 · 18e9b70
2 parents a1e9d2b + cd7cf0f
commit 18e9b70
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 25 deletions.
diff --git a/.github/workflows/linux-tests.yml b/.github/workflows/linux-tests.yml
@@ -42,22 +42,23 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y --no-install-recommends '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev libegl1
       - name: Install Conda
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
            activate-environment: test
            auto-update-conda: false
            auto-activate-base: false
+           miniforge-version: latest
+           mamba-version: "*"
            channels: conda-forge
-           channel-priority: strict
-           miniforge-variant: Mambaforge
+           channel-priority: true
            python-version: ${{ matrix.PYTHON_VERSION }}
       - name: Install dependencies with conda
         if: matrix.INSTALL_TYPE == 'conda'
-        shell: bash -l {0}
+        shell: bash -el {0}
         run: mamba env update --file requirements/environment.yml
       - name: Install dependencies with pip
         if: matrix.INSTALL_TYPE == 'pip'
-        shell: bash -l {0}
+        shell: bash -el {0}
         run: |
           pip install -e .[test]
           if [ ${{ matrix.QT_LIB }} = "pyqt6" ]; then
@@ -66,18 +67,18 @@ jobs:
             pip install ${{ matrix.QT_LIB }} coveralls pytest-cov
           fi
       - name: Show environment information
-        shell: bash -l {0}
+        shell: bash -el {0}
         run: |
           conda info
           conda list
           pip list
       - name: Run tests
-        shell: bash -l {0}
+        shell: bash -el {0}
         run: xvfb-run --auto-servernum pytest -vv -s --color=yes --cov=qtconsole qtconsole
         env:
           QT_API: ${{ matrix.QT_LIB }}
           PYTEST_QT_API: ${{ matrix.QT_LIB }}
       - name: Upload coverage to coveralls
         if: matrix.PYTHON_VERSION == '3.8'
-        shell: bash -l {0}
+        shell: bash -el {0}
         run: coveralls
diff --git a/.github/workflows/macos-tests.yml b/.github/workflows/macos-tests.yml
@@ -30,23 +30,24 @@ jobs:
       - name: Checkout branch
         uses: actions/checkout@v3
       - name: Install Conda
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
            activate-environment: test
            auto-update-conda: false
            auto-activate-base: false
-           python-version: ${{ matrix.PYTHON_VERSION }}
-           miniforge-variant: Mambaforge
+           miniforge-version: latest
+           mamba-version: "*"
            channels: conda-forge
-           channel-priority: strict
+           channel-priority: true
+           python-version: ${{ matrix.PYTHON_VERSION }}
       - name: Install package dependencies
-        shell: bash -l {0}
+        shell: bash -el {0}
         run: mamba env update --file requirements/environment.yml
       - name: Show environment information
-        shell: bash -l {0}
+        shell: bash -el {0}
         run: |
           conda info
           conda list
       - name: Run tests
-        shell: bash -l {0}
+        shell: bash -el {0}
         run: pytest -vv --color=yes --cov=qtconsole qtconsole
diff --git a/.github/workflows/windows-tests.yml b/.github/workflows/windows-tests.yml
@@ -29,24 +29,23 @@ jobs:
     steps:
       - name: Checkout branch
         uses: actions/checkout@v3
-      - name: Install Conda
-        uses: conda-incubator/setup-miniconda@v2
+      - name: Install Conda and install package dependencies
+        uses: conda-incubator/setup-miniconda@v3
         with:
            activate-environment: test
            auto-update-conda: false
            auto-activate-base: false
-           python-version: ${{ matrix.PYTHON_VERSION }}
-           miniforge-variant: Mambaforge
+           miniforge-version: latest
+           mamba-version: "*"
            channels: conda-forge
-           channel-priority: strict
-      - name: Install package dependencies
-        shell: bash -l {0}
-        run: mamba env update --file requirements/environment.yml
+           channel-priority: true
+           python-version: ${{ matrix.PYTHON_VERSION }}
+           environment-file: requirements/environment.yml # Need to set up dependencies in the same step due to https://github.com/conda-incubator/setup-miniconda/issues/371
       - name: Show environment information
-        shell: bash -l {0}
+        shell: bash -el {0}
         run: |
           conda info
           conda list
       - name: Run tests
-        shell: bash -l {0}
+        shell: bash -el {0}
         run: pytest -vv --color=yes --cov=qtconsole qtconsole