Merge branch 'master' into release

.github/ranger.yml

@@ -0,0 +1,21 @@
+default:
+  close:
+    comment: This has been marked to be closed in $DELAY.
+    delay: 7d
+labels:
+  duplicate: close
+  wontfix: close
+  invalid: close
+  "squash when passing": merge
+  "next week":
+    action: comment
+    delay: 7d
+    message: "You asked me to remind you about this last week."
+  tomorrow:
+    action: comment
+    delay: 1d
+    message: "You asked me to remind you about this yesterday."
+comments: []
+commits: []
+merges:
+  - action: delete_branch

.github/stale.yml

@@ -0,0 +1,57 @@
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 60
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 7
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - meta
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: true
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Comment to post when marking as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+
+# Comment to post when removing the stale label.
+# unmarkComment: >
+#   Your comment here.
+
+# Comment to post when closing a stale Issue or Pull Request.
+# closeComment: >
+#   Your comment here.
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+# Limit to only `issues` or `pulls`
+# only: issues
+
+# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
+# pulls:
+#   daysUntilStale: 30
+#   markComment: >
+#     This pull request has been automatically marked as stale because it has not had
+#     recent activity. It will be closed if no further activity occurs. Thank you
+#     for your contributions.
+
+# issues:
+#   exemptLabels:
+#     - confirmed

.github/workflows/linux.yml

@@ -0,0 +1,98 @@
+name: Linux
+on:
+  push:
+    branches:
+      - master
+      - release
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  ubuntu-pip:
+    name: py${{ matrix.python.name }}-${{ matrix.qt_api.name }}-qt${{ matrix.qt_version.name }}-vtk${{ matrix.vtk_version.name }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python:
+          - name: '3.7'
+        qt_api:
+          - name: 'PyQt5'
+        qt_version:
+          - name: '5.14.2'
+          - name: '5.15.0'
+        vtk_version:
+          - name: '8.1.2'
+    defaults:
+      run:
+        shell: bash
+    env:
+      DISPLAY: ':99'
+    steps:
+      - uses: actions/checkout@v2
+      - run: |
+          sudo apt-get install -y libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0
+          /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1400x900x24 -ac +extension GLX +render -noreset;
+        name: 'Setup xvfb'
+      - uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python.name }}
+          architecture: 'x64'
+        name: 'Setup python'
+      - run: |
+          python -m pip install --upgrade pip setuptools wheel
+          pip install ${{ matrix.qt_api.name }}==${{ matrix.qt_version.name }}
+          pip install -r requirements_testing.txt
+          pip install vtk==${{ matrix.vtk_version.name }}
+        name: 'Install dependencies'
+      - run: pip install -e .
+        name: 'Install blockbuilder'
+      - run: pytest -v blockbuilder -n 1
+        name: 'Run tests'
+
+  ubuntu-conda:
+    name: conda-pyqt5
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
+    env:
+      DISPLAY: ':99'
+    steps:
+      - uses: actions/checkout@v2
+      - run: |
+          sudo apt-get install -y libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 libopengl0
+          /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1400x900x24 -ac +extension GLX +render -noreset;
+        name: 'Setup xvfb'
+      - uses: s-weigand/setup-conda@v1
+        name: 'Setup conda'
+      - run: |
+          conda env update --file environment.yml
+          pip install PyQt5 pytest pytest-qt pytest-cov pytest-sugar pytest-xdist coverage
+        name: 'Install dependencies'
+      - run: pip install -e .
+        name: 'Install blockbuilder'
+      - run: pytest -v blockbuilder -n 1
+        name: 'Run tests'
+
+  # Linux test with pytest-xvfb
+  # ---
+  # ubuntu-py37-64bit:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - run: sudo apt install libxkbcommon-x11-0
+  #       name: 'Install libxkbcommon-x11-0'
+  #     - uses: actions/setup-python@v2
+  #       with:
+  #         python-version: '3.7'
+  #         architecture: 'x64'
+  #     - run: |
+  #         python -m pip install --upgrade pip setuptools wheel
+  #         pip install -r requirements_testing.txt
+  #         pip install pytest-faulthandler pytest-xvfb
+  #       name: 'Install dependencies'
+  #     - run: pip install -e .
+  #       name: 'Install blockbuilder'
+  #     - run: pytest -v blockbuilder -n 1
+  #       name: 'Run tests'

.github/workflows/macos.yml

@@ -0,0 +1,44 @@
+name: MacOS
+on:
+  push:
+    branches:
+      - master
+      - release
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  macos-pip:
+    name: py${{ matrix.python.name }}-${{ matrix.qt_api.name }}-qt${{ matrix.qt_version.name }}-vtk${{ matrix.vtk_version.name }}
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        python:
+          - name: '3.7'
+          - name: '3.8'
+        qt_api:
+          - name: 'PyQt5'
+          - name: 'PySide2'
+        qt_version:
+          - name: '5.14.2'
+          - name: '5.15.0'
+        vtk_version:
+          - name: '9.0.0'
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python.name }}
+          architecture: 'x64'
+        name: 'Setup python'
+      - run: |
+          python -m pip install --upgrade pip setuptools wheel
+          pip install ${{ matrix.qt_api.name }}==${{ matrix.qt_version.name }}
+          pip install -r requirements_testing.txt
+          pip install vtk==${{ matrix.vtk_version.name }}
+        name: 'Install dependencies'
+      - run: pip install -e .
+        name: 'Install blockbuilder'
+      - run: pytest -v blockbuilder -n 1
+        name: 'Run tests'

.github/workflows/testing.yml → .github/workflows/maintenance.yml

@@ -1,4 +1,4 @@
-name: Testing
+name: Maintenance
 on:
   push:
     branches:
@@ -20,6 +20,10 @@ jobs:
         name: 'Setup python'
       - run: python -m pip install --upgrade pip setuptools wheel
         name: 'Install dependencies'
+      - run: pip install flake8
+        name: 'Install flake8'
+      - run: make flake8
+        name: 'Run flake8'
       - run: pip install codespell
         name: 'Install codespell'
       - run: make codespell
@@ -29,33 +33,7 @@ jobs:
       - run: make pydocstyle
         name: 'Run pydocstyle'
 
-  windows-py38-64bit:
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-        with:
-          python-version: '3.8'
-          architecture: 'x64'
-        name: 'Setup python'
-      - run: .\install_opengl.ps1
-        shell: pwsh
-        name: 'Install opengl'
-      - run: |
-          python -m pip install --upgrade pip setuptools wheel
-          pip install -r requirements_testing.txt
-        name: 'Install dependencies'
-      - run: pip install -e .
-        name: 'Install blockbuilder'
-      - run: pytest --cov=blockbuilder -n 1
-        name: 'Run tests'
-      - uses: codecov/codecov-action@v1
-        if: success()
-        with:
-          token: ${{ secrets.CODECOV_UPLOAD_TOKEN }}
-        name: 'Upload coverage to CodeCov'
-
-  ubuntu-py37-64bit:
+  coverage:
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -76,6 +54,7 @@ jobs:
       - run: |
           python -m pip install --upgrade pip setuptools wheel
           pip install -r requirements_testing.txt
+          pip install PyQt5
         name: 'Install dependencies'
       - run: pip install -e .
         name: 'Install blockbuilder'
@@ -87,25 +66,8 @@ jobs:
           project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
           coverage-reports: cobertura.xml
         name: 'Upload coverage to Codacy'
-
-  # Linux test with pytest-xvfb
-  # ---
-  # ubuntu-py37-64bit:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - run: sudo apt install libxkbcommon-x11-0
-  #       name: 'Install libxkbcommon-x11-0'
-  #     - uses: actions/setup-python@v2
-  #       with:
-  #         python-version: '3.7'
-  #         architecture: 'x64'
-  #     - run: |
-  #         python -m pip install --upgrade pip setuptools wheel
-  #         pip install -r requirements_testing.txt
-  #         pip install pytest-faulthandler pytest-xvfb
-  #       name: 'Install dependencies'
-  #     - run: pip install -e .
-  #       name: 'Install blockbuilder'
-  #     - run: pytest -v blockbuilder -n 1
-  #       name: 'Run tests'
+      - uses: codecov/codecov-action@v1
+        if: success()
+        with:
+          token: ${{ secrets.CODECOV_UPLOAD_TOKEN }}
+        name: 'Upload coverage to CodeCov'

.github/workflows/windows.yml

@@ -0,0 +1,47 @@
+name: Windows
+on:
+  push:
+    branches:
+      - master
+      - release
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  windows-pip:
+    name: py${{ matrix.python.name }}-${{ matrix.qt_api.name }}-qt${{ matrix.qt_version.name }}-vtk${{ matrix.vtk_version.name }}
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        python:
+          - name: '3.7'
+          - name: '3.8'
+        qt_api:
+          - name: 'PyQt5'
+          - name: 'PySide2'
+        qt_version:
+          - name: '5.14.2'
+          - name: '5.15.0'
+        vtk_version:
+          - name: '9.0.0'
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python.name }}
+          architecture: 'x64'
+        name: 'Setup python'
+      - run: .\install_opengl.ps1
+        shell: pwsh
+        name: 'Install opengl'
+      - run: |
+          python -m pip install --upgrade pip setuptools wheel
+          pip install ${{ matrix.qt_api.name }}==${{ matrix.qt_version.name }}
+          pip install -r requirements_testing.txt
+          pip install vtk==${{ matrix.vtk_version.name }}
+        name: 'Install dependencies'
+      - run: pip install -e .
+        name: 'Install blockbuilder'
+      - run: pytest -v blockbuilder -n 1
+        name: 'Run tests'

.gitignore

@@ -4,5 +4,6 @@ cobertura.xml
 __pycache__
 build
 *.egg*
+*.zip
 dist/
 htmlcov/