Merge 0340771 into 84f0658

spyder-ide · Feb 6, 2020 · 454eb28 · 454eb28
2 parents 84f0658 + 0340771
commit 454eb28
Show file tree

Hide file tree

Showing 14 changed files with 259 additions and 203 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.circleci/install.sh b/.circleci/install.sh
diff --git a/.circleci/test-pyqt4.sh b/.circleci/test-pyqt4.sh
diff --git a/.circleci/test-pyside.sh b/.circleci/test-pyside.sh
diff --git a/.circleci/test-pyside2.sh b/.circleci/test-pyside2.sh
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,168 @@
+name: Tests
+
+on:
+  # This avoids having duplicate builds for a pull request
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - master
+
+jobs:
+  smoke:
+    name: Linux smoke test Py${{ matrix.PYTHON_VERSION }} conda=yes
+    runs-on: ubuntu-latest
+    env:
+      CI: True
+      PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
+      USE_CONDA: 'Yes'
+    strategy:
+      fail-fast: false 
+      matrix:
+        PYTHON_VERSION: ['3.5']
+    steps:
+      - name: Checkout branch
+        uses: actions/checkout@v1.2.0
+      - name: Install System Packages
+        run: | 
+          sudo apt-get update
+          sudo apt-get install libpulse-dev
+          sudo apt-get install libegl1-mesa
+          sudo apt-get install libqtwebkit4
+      - name: Install Conda
+        uses: goanpeca/setup-miniconda@v1
+        with:
+           activate-environment: ''
+           auto-update-conda: true
+           auto-activate-base: false
+      - name: Test PyQt5
+        shell: bash -l {0}
+        run: |
+          eval "$(conda shell.bash hook)"
+          xvfb-run --auto-servernum ./.github/workflows/test-pyqt5.sh
+      - name: Test PySide2
+        shell: bash -l {0}
+        run: xvfb-run --auto-servernum ./.github/workflows/test-pyside2.sh
+      - name: Test PyQt4
+        shell: bash -l {0}
+        run: xvfb-run --auto-servernum ./.github/workflows/test-pyqt4.sh
+      - name: Test PySide
+        shell: bash -l {0}
+        run: xvfb-run --auto-servernum ./.github/workflows/test-pyside.sh
+      - name: Upload coverage
+        shell: bash -l {0}
+        run: ./.github/workflows/coverage.sh
+
+  linux:
+    name: Linux Py${{ matrix.PYTHON_VERSION }} conda=${{ matrix.USE_CONDA }}
+    needs: smoke
+    runs-on: ubuntu-latest
+    env:
+      CI: True
+      PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
+      USE_CONDA: ${{ matrix.USE_CONDA }}
+    strategy:
+      fail-fast: false 
+      matrix:
+        PYTHON_VERSION: ['2.7', '3.6']
+        USE_CONDA: ['Yes', 'No']
+    steps:
+      - name: Checkout branch
+        uses: actions/checkout@v1.2.0
+      - name: Install System Packages
+        run: | 
+          sudo apt-get update
+          sudo apt-get install libpulse-dev
+          sudo apt-get install libegl1-mesa
+          sudo apt-get install libqtwebkit4
+      - name: Install Conda
+        uses: goanpeca/setup-miniconda@v1
+        with:
+           activate-environment: ''
+           auto-update-conda: true
+           auto-activate-base: false
+      - name: Test PyQt5
+        shell: bash -l {0}
+        run: |
+          eval "$(conda shell.bash hook)"
+          xvfb-run --auto-servernum ./.github/workflows/test-pyqt5.sh
+      - name: Test PySide2
+        shell: bash -l {0}
+        run: xvfb-run --auto-servernum ./.github/workflows/test-pyside2.sh
+      - name: Test PyQt4
+        shell: bash -l {0}
+        run: xvfb-run --auto-servernum ./.github/workflows/test-pyqt4.sh
+      - name: Test PySide
+        shell: bash -l {0}
+        run: xvfb-run --auto-servernum ./.github/workflows/test-pyside.sh
+
+  windows:
+    name: Windows Py${{ matrix.PYTHON_VERSION }} conda=${{ matrix.USE_CONDA }}
+    needs: smoke
+    runs-on: windows-latest
+    env:
+      CI: True
+      PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
+      USE_CONDA: ${{ matrix.USE_CONDA }}
+    strategy:
+      fail-fast: false 
+      matrix:
+        PYTHON_VERSION: ['2.7', '3.5', '3.6']
+        USE_CONDA: ['Yes', 'No']
+    steps:
+      - name: Checkout branch
+        uses: actions/checkout@v1.2.0
+      - name: Install Conda
+        uses: goanpeca/setup-miniconda@v1
+        with:
+           activate-environment: ''
+           auto-update-conda: true
+           auto-activate-base: true
+      - name: Test PyQt5
+        shell: bash -l {0}
+        run: ./.github/workflows/test-pyqt5.sh
+      - name: Test PySide2
+        shell: bash -l {0}
+        run: ./.github/workflows/test-pyqt5.sh
+      - name: Test PyQt4
+        shell: bash -l {0}
+        run: ./.github/workflows/test-pyqt4.sh
+      - name: Test PySide
+        shell: bash -l {0}
+        run: ./.github/workflows/test-pyside.sh
+
+  macos:
+    name: Mac Py${{ matrix.PYTHON_VERSION }} conda=${{ matrix.USE_CONDA }}
+    needs: smoke
+    runs-on: macos-latest
+    env:
+      CI: True
+      PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
+      USE_CONDA: ${{ matrix.USE_CONDA }}
+    strategy:
+      fail-fast: false 
+      matrix:
+        PYTHON_VERSION: ['2.7', '3.5', '3.6']
+        USE_CONDA: ['Yes', 'No']
+    steps:
+      - name: Checkout branch
+        uses: actions/checkout@v1.2.0
+      - name: Install Conda
+        uses: goanpeca/setup-miniconda@v1
+        with:
+           activate-environment: ''
+           auto-update-conda: true
+           auto-activate-base: false
+      - name: Test PyQt5
+        shell: bash -l {0}
+        run: ./.github/workflows/test-pyqt5.sh
+      - name: Test PySide2
+        shell: bash -l {0}
+        run: ./.github/workflows/test-pyside2.sh
+      - name: Test PyQt4
+        shell: bash -l {0}
+        run: ./.github/workflows/test-pyqt4.sh
+      - name: Test PySide
+        shell: bash -l {0}
+        run: ./.github/workflows/test-pyside.sh
diff --git a/.circleci/coverage.sh → .github/workflows/coverage.sh b/.circleci/coverage.sh → .github/workflows/coverage.sh
@@ -1,9 +1,10 @@
 #!/bin/bash
 
-export COVERALLS_REPO_TOKEN="xh75EzxFFMoTEyNPo3wXxXv8OVkul3eE5"
-export PATH="$HOME/miniconda/bin:$PATH"
-source activate test
+eval "$(conda shell.bash hook)"
+conda deactivate
+conda activate test-pyqt5
 
+export COVERALLS_REPO_TOKEN="xh75EzxFFMoTEyNPo3wXxXv8OVkul3eE5"
 coveralls
 
 # Don't fail at this step

diff --git a/.github/workflows/test-pyqt4.sh b/.github/workflows/test-pyqt4.sh
@@ -0,0 +1,23 @@
+#!/bin/bash -ex
+
+eval "$(conda shell.bash hook)"
+
+# Create conda environment for this test
+conda create -n test-pyqt4
+conda activate test-pyqt4
+
+if [ "$USE_CONDA" = "No" ]; then
+    conda install coveralls mock pytest pytest-cov python="$PYTHON_VERSION" -c conda-forge -q
+    pip install pyqt==4
+elif [ "$PYTHON_VERSION" = "3.6" ]; then
+    exit 0
+else
+    conda install coveralls mock pytest pytest-cov python="$PYTHON_VERSION" -c anaconda -q
+    conda install qt=4.* pyqt=4.* -c anaconda -q
+fi
+
+# Install package
+python setup.py develop
+
+# Run tests
+python qtpy/tests/runtests.py
diff --git a/.circleci/test-pyqt5.sh → .github/workflows/test-pyqt5.sh b/.circleci/test-pyqt5.sh → .github/workflows/test-pyqt5.sh
@@ -1,7 +1,11 @@
 #!/bin/bash -ex
 
-source $HOME/miniconda/etc/profile.d/conda.sh
-conda activate test
+eval "$(conda shell.bash hook)"
+
+# Create conda environment for this test
+conda create -n test-pyqt5
+conda activate test-pyqt5
+conda install coveralls mock pytest pytest-cov python="$PYTHON_VERSION" -c conda-forge -q
 
 # Select build with QtMultimedia
 if [ "$PYTHON_VERSION" = "2.7" ]; then
@@ -13,8 +17,8 @@ else
 fi
 
 if [ "$USE_CONDA" = "Yes" ]; then
-    conda install -q qt=5.* pyqt=5.9.2=$BUILD
-    conda install -q sip=4.19.8
+    conda install -q qt=5.* pyqt=5.9.2=$BUILD -c conda-forge -q
+    conda install -q sip=4.19.8 -c conda-forge -q
 else
     if [ "$PYTHON_VERSION" = "2.7" ]; then
         # There are no pyqt5 wheels for Python 2
@@ -25,4 +29,8 @@ else
     fi
 fi
 
+# Install package
+python setup.py develop
+
+# Run tests
 python qtpy/tests/runtests.py