Merge branch 'master' into qps_modifications

# Conflicts:
#	pyqtgraph/__init__.py

.github/dependabot.yml

@@ -1,14 +1,18 @@
-# Set update schedule for GitHub Actions
-
 version: 2
 updates:
-
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       # Check for updates to GitHub Actions every weekday
       interval: "daily"
-  - package-ecosystem: pip
-    directory: /doc
+  - package-ecosystem: "pip"
+    directory: "/doc"
     schedule:
-      interval: daily
+      interval: "daily"
+  - package-ecosystem: "pip"
+    directory: ".github/workflows/etc"
+    ignore:
+      - dependency-name: "numpy"
+      # NEP-29 governs supported versions of NumPy
+    schedule:
+      interval: "daily"

.github/workflows/etc/requirements.txt

@@ -0,0 +1,22 @@
+# numpy based on python version and NEP-29 requirements
+numpy; python_version == '3.10'
+numpy; python_version == '3.11'
+numpy~=1.22.0; python_version == '3.9'
+
+# image testing
+scipy==1.11.2
+
+# optional high performance paths
+numba==0.57.1; python_version == '3.9'
+
+# optional 3D
+pyopengl==3.1.7
+
+# supplimental tools
+matplotlib==3.7.2
+h5py==3.9.0
+
+# testing
+pytest==7.4.0
+pytest-xdist==3.3.1
+pytest-xvfb==3.0.0; sys_platform == 'linux'

.github/workflows/main.yml

@@ -23,29 +23,35 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
         qt-lib: [pyqt, pyside]
-        python-version: ["3.8", "3.9", "3.10"]
-        exclude:
-          - qt-lib: pyside
-            python-version: "3.8"
+        python-version: ["3.9", "3.10", "3.11"]
         include:
-          - python-version: "3.8"
-            qt-lib: "pyqt"
-            qt-version: "PyQt5~=5.12.0"
           - python-version: "3.9"
             qt-lib: "pyqt"
             qt-version: "PyQt5~=5.15.0"
           - python-version: "3.9"
             qt-lib: "pyside"
             qt-version: "PySide2~=5.15.0"
+          - python-version: "3.10"
+            qt-lib: "pyqt"
+            qt-version: "PyQt6~=6.2.0 PyQt6-Qt6~=6.2.0"
+          - python-version: "3.10"
+            qt-lib: "pyside"
+            qt-version: "PySide6~=6.2.0"
           - python-version: "3.10"
             qt-lib: "pyqt"
             qt-version: "PyQt6"
           - python-version: "3.10"
             qt-lib: "pyside"
             qt-version: "PySide6-Essentials"
+          - python-version: "3.11"
+            qt-lib: "pyqt"
+            qt-version: "PyQt6"
+          - python-version: "3.11"
+            qt-lib: "pyside"
+            qt-version: "PySide6-Essentials"
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Setup Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:
@@ -55,7 +61,8 @@ jobs:
     - name: Get pip cache dir
       id: pip-cache
       run: |
-        echo "::set-output name=dir::$(pip cache dir)"
+        echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
+      shell: bash
     - name: pip cache
       uses: actions/cache@v3
       with:
@@ -82,7 +89,7 @@ jobs:
       shell: cmd
     - name: Install Dependencies
       run: |
-        python -m pip install -r .github/workflows/requirements.txt ${{ matrix.qt-version }} .
+        python -m pip install -r .github/workflows/etc/requirements.txt ${{ matrix.qt-version }} .
     - name: "Install Linux VirtualDisplay"
       if: runner.os == 'Linux'
       run: |
@@ -98,7 +105,8 @@ jobs:
           libxcb-randr0 \
           libxcb-render-util0 \
           libxcb-xinerama0 \
-          libopengl0
+          libopengl0 \
+          libxcb-cursor0
     - name: 'Debug Info'
       run: |
         echo python location: `which python`
@@ -154,14 +162,15 @@ jobs:
             environment-file: .github/workflows/etc/environment-pyside.yml
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - uses: conda-incubator/setup-miniconda@v2
         with:
           miniforge-version: latest
           miniforge-variant: Mambaforge
           environment-file: ${{ matrix.environment-file }}
           auto-update-conda: false
-          python-version: "3.8"
+          python-version: "3.10"
+          use-mamba: true
       - name: "Install Test Framework"
         run: pip install pytest pytest-xdist
       - name: "Install Windows-Mesa OpenGL DLL"
@@ -196,7 +205,8 @@ jobs:
             libxcb-randr0 \
             libxcb-render-util0 \
             libxcb-xinerama0 \
-            libopengl0
+            libopengl0 \
+            libxcb-cursor0
           pip install pytest-xvfb
       - name: 'Debug Info'
         run: |
@@ -232,11 +242,11 @@ jobs:
     name: build wheel
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Setup Python 3.9
+      - uses: actions/checkout@v4
+      - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.11'
       - name: Build Wheel
         run: |
           python -m pip install setuptools wheel
@@ -247,15 +257,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.
         fetch-depth: 2
     - name: Setup Python
       uses: actions/setup-python@v4
       with:
-        python-version: '3.9'
+        python-version: '3.11'
     - name: Install Dependencies
       run: |
         python -m pip install PyQt5 numpy scipy

.github/workflows/python-publish.yml

@@ -5,15 +5,15 @@ name: Upload Python Package
 
 on:
   release:
-    types: [created]
+    types: [published]
 
 jobs:
   deploy:
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python
       uses: actions/setup-python@v4
       with:

.gitignore

@@ -77,6 +77,8 @@ coverage.xml
 *.am
 *.tiff
 *.tif
+*.png
+!doc/source/**/*.png
 *.dat
 *.DAT
 
@@ -110,3 +112,5 @@ asv.conf.json
 
 # jupyter notebooks
 .ipynb_checkpoints
+
+.venv

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.2.0
+    rev: v4.4.0
     hooks:
     -   id: check-added-large-files
         args: ['--maxkb=100']
@@ -15,6 +15,6 @@ repos:
     -   id: debug-statements
     -   id: check-ast
 -   repo: https://github.com/pycqa/isort
-    rev: 5.10.1
+    rev: 5.12.0
     hooks:
     -   id: isort

.readthedocs.yaml

@@ -7,6 +7,8 @@ build:
   os: ubuntu-22.04
   tools:
     python: "3"
+  apt_packages:
+    - libopengl0
 
 sphinx:
   fail_on_warning: true