update python versions and dependencies in pyproject.toml

.github/workflows/build-docs.yml

@@ -1,12 +1,13 @@
 name: Build docs
 on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
+  workflow_call:
+    inputs:
+      python-version:
+        required: true
+        type: string
 
 jobs:
-  build:
+  build-docs:
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
@@ -16,6 +17,7 @@ jobs:
           environment-file: ./environment-dev.yml
           init-shell: bash
           create-args: --verbose
+            python=${{ inputs.python-version }}
           cache-environment: true
           cache-downloads: false
 

.github/workflows/build-ultraplot.yml

@@ -1,12 +1,14 @@
 name: Build and Test
 on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
+  workflow_call:
+    inputs:
+      python-version:
+        required: true
+        type: string
 
 jobs:
-  build:
+  build-ultraplot:
+    name: Test Python ${{ inputs.python-version }}
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
@@ -15,13 +17,44 @@ jobs:
         with:
           environment-file: ./environment-dev.yml
           init-shell: bash
-          create-args: --verbose
+          create-args: >-
+            --verbose
+            python=${{ inputs.python-version }}
           cache-environment: true
           cache-downloads: false
 
-      - name: Test Ultraplot
+      - name: Build Ultraplot
         shell: bash -el {0}
         run: |
           micromamba activate ultraplot-dev
           pip install .
-          python -m pytest
+
+      - name: Generate baseline from main
+        shell: bash -el {0}
+        run: |
+          mkdir -p baseline
+          micromamba activate ultraplot-dev
+          git fetch origin ${{ github.event.pull_request.base.sha }}
+          git checkout ${{ github.event.pull_request.base.sha }}
+          pytest --mpl-generate-path=baseline_images
+          git checkout ${{ github.sha }}  # Return to PR branch
+
+      - name: Test Ultraplot
+        shell: bash -el {0}
+        run: |
+          micromamba activate ultraplot-dev
+          pytest
+
+      # - name: Image Comparison Ultraplot
+      #   shell: bash -el {0}
+      #   run: |
+      #     micromamba activate ultraplot-dev
+      #     pytest --mpl --mpl-baseline-path=baseline_images
+
+      # # return the images that failed
+      # - name: Upload comparison failures
+      #   if: failure()
+      #   uses: actions/upload-artifact@v4
+      #   with:
+      #     name: failed-comparisons
+      #     path: result_images

.github/workflows/linter.yml

@@ -6,7 +6,7 @@ on:
     branches: [main]
 
 jobs:
-  build:
+  linter:
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:

.github/workflows/main.yml

@@ -0,0 +1,71 @@
+name: Matrix Test
+on:
+  push:
+    branches: [main, devel]
+  pull_request:
+    branches: [main, devel]
+
+jobs:
+  get-python-versions:
+    runs-on: ubuntu-latest
+    outputs:
+      python-versions: ${{ steps.set-versions.outputs.python-versions }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.11"
+
+      - name: Install dependencies
+        run: pip install tomli
+
+      - id: set-versions
+        run: |
+          # Create a Python script to read and parse versions
+          cat > get_versions.py << 'EOF'
+          import tomli
+          import re
+          import json
+
+          # Read pyproject.toml
+          with open("pyproject.toml", "rb") as f:
+              data = tomli.load(f)
+
+          # Get Python version requirement
+          python_req = data["project"]["requires-python"]
+
+          # Parse min and max versions
+          min_version = re.search(r">=(\d+\.\d+)", python_req)
+          max_version = re.search(r"<(\d+\.\d+)", python_req)
+
+          versions = []
+          if min_version and max_version:
+              # Convert version strings to tuples
+              min_v = tuple(map(int, min_version.group(1).split(".")))
+              max_v = tuple(map(int, max_version.group(1).split(".")))
+
+              # Generate version list
+              current = min_v
+              while current < max_v:
+                  versions.append(".".join(map(str, current)))
+                  current = (current[0], current[1] + 1)
+
+          # Print as JSON array
+          print(json.dumps(versions))
+          EOF
+
+          # Run the script and capture output
+          VERSIONS=$(python3 get_versions.py)
+          echo "Detected versions: ${VERSIONS}"  # Debug output
+          echo "python-versions=${VERSIONS}" >> $GITHUB_OUTPUT
+
+  build:
+    needs: get-python-versions
+    strategy:
+      matrix:
+        python-version: ${{ fromJson(needs.get-python-versions.outputs.python-versions) }}
+        locale: ["en_US.UTF-8", "C.UTF-8"]
+      fail-fast: false
+    uses: ./.github/workflows/build-ultraplot.yml
+    with:
+      python-version: ${{ matrix.python-version }}

environment-dev.yml

@@ -2,9 +2,9 @@ name: ultraplot-dev
 channels:
   - conda-forge
 dependencies:
-  - python==3.12
-  - numpy>=2.2
-  - matplotlib>=3.9.3
+  - python>=3.9, <3.13
+  - numpy>=1.20.0
+  - matplotlib>=3.9
   - cartopy
   - xarray
   - seaborn
@@ -21,5 +21,5 @@ dependencies:
       - nbsphinx
       - sphinx-copybutton
       - sphinx-autoapi
-      - git+https://github.com/cvanelteren/sphinx-rtd-light-dark.git@mplv3.9.1
+      - git+https://github.com/ultraplot/UltraTheme.git@mplv3.9.1
       - sphinx-automodapi

environment.yml

@@ -3,9 +3,9 @@ channels:
   - conda-forge
   - nodefaults
 dependencies:
-  - python >=3.9
+  - python >=3.9, <3.13
   - pytest
   - pytest-mpl
-  - numpy
-  - matplotlib>=3.9.2
+  - numpy>=1.20.0
+  - matplotlib>=3.9
   - pip

pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=64",
             "setuptools_scm[toml]>=8",
             "wheel",
             "numpy>=1.26.0",
-            "matplotlib>=3.9.1",
+            "matplotlib>=3.9",
             ]
 build-backend = "setuptools.build_meta"
 
@@ -19,22 +19,21 @@ maintainers = [
 ]
 description = "A succinct matplotlib wrapper for making beautiful, publication-quality graphics."
 readme = "README.rst"
-requires-python = ">=3.6.0"
+requires-python = ">=3.9,<3.13"
 license = {text = "MIT"}
 classifiers = [
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
     "Intended Audience :: Science/Research",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
 ]
 dependencies= [
-  'importlib-metadata; python_version>"3.8"',
-
+    "numpy>=1.26.0",
+    "matplotlib>=3.9"
 ]
 dynamic = ["version"]