Merge branch 'dev' into fix_skimage_version

# Conflicts:
#	src/porespy/metrics/_regionprops.py
#	test/unit/test_filters.py
#	test/unit/test_network_size_factor.py
#	test/unit/test_parallel_filters.py

.github/release.yml

@@ -1,5 +1,3 @@
-# .github/release.yml
-
 changelog:
   exclude:
     labels:
@@ -9,26 +7,22 @@ changelog:
   categories:
     - title: Breaking Changes ⚠️
       labels:
-        - Semver-Major
-        - breaking-change
         - api
     - title: New Features 🎉
       labels:
-        - Semver-Minor
-        - enhancement
         - new
+    - title: Enhancements 🚀
+      labels:
+        - enhancement
     - title: Maintenance 🛠
       labels:
-        - Semver-Patch
         - maint
     - title: Documentation 📗
       labels:
         - doc
-        - example
     - title: Big Fixes 🐛
       labels:
-        - Semver-Patch
         - bug
-    - title: Other Changes ❓
+    - title: Unsorted ❓
       labels:
         - "*"

.github/workflows/bump-version-dev.yml

@@ -16,20 +16,21 @@ jobs:
       contents: write
 
     steps:
-    - uses: actions/checkout@v4
+    - name: Checkout code
+      uses: actions/checkout@v4
 
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
+        python-version: '3.12'
 
-    - name: Set env variables
+    - name: Install uv for faster builds
       run: |
-        echo "${{ github.event.head_commit.message }}"
+        curl -LsSf https://astral.sh/uv/install.sh | sh
 
     - name: Install dependencies
       run: |
-        pip install -e .[build]
+        uv pip install --system -e .[build]
 
     - name: Bump version (dev)
       run: |

.github/workflows/examples.yml

@@ -14,35 +14,32 @@ jobs:
       fail-fast: false
       max-parallel: 5
       matrix:
-        python-version: ['3.10']
+        python-version: ['3.12']
         operating-system: [ubuntu-latest]
         # Next line should be [1, 2, ..., max-parallel)
         test_group: [1, 2, 3, 4, 5]
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: FedericoCarboni/setup-ffmpeg@v3
-      - name: Set up Python ${{ matrix.python-version }}
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Cache pip
-        uses: actions/cache@v4
-        with:
-          # This path is specific to Ubuntu
-          path: ~/.cache/pip
-          # Look to see if there is a cache hit for the corresponding requirements file
-          key: ${{ runner.os }}-pip-${{ hashFiles('pyproject.toml') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-            ${{ runner.os }}-
-
-      - name: Install dependencies (pip)
+      - name: Install uv for faster builds
         run: |
-          pip install -e .[test,extras]
+          curl -LsSf https://astral.sh/uv/install.sh | sh
+
+      - name: Install dependencies
+        run: |
+          uv pip install --system -e .[test,extras]
+
+      - name: Install ffmpeg
+        uses: FedericoCarboni/setup-ffmpeg@v3
 
-      - name: Running tests
+      - name: Run examples
         # Make sure to pass max-parallel to --splits
         run: |
           pytest \

.github/workflows/gh-pages.yml

@@ -15,37 +15,29 @@ jobs:
         shell: bash -l {0}
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout code
+        uses: actions/checkout@v4
 
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '3.12'
 
-      - name: Cache pip
-        uses: actions/cache@v2
-        with:
-          # This path is specific to Ubuntu
-          path: ~/.cache/pip
-          # Look to see if there is a cache hit for the corresponding requirements file
-          key: ${{ runner.os }}-pip-${{ hashFiles('pyproject.toml') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-            ${{ runner.os }}-
-
-      - name: Install dependencies (conda)
+      - name: Install uv for faster builds
+        run: |
+          curl -LsSf https://astral.sh/uv/install.sh | sh
+
+      - name: Install PoreSpy
         run: |
-          pip install -e .[docs,interactive]
+          uv pip install --system -e .[docs,interactive]
 
-      # Build the documentation
       - name: Build the documentation
         run: |
           cd docs
           make html
 
-      # Push the documentation's HTML to github-pages
-      - name: GitHub Pages action
-        uses: peaceiris/actions-gh-pages@v3
+      - name: Publish the documentation to GitHub Pages
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./docs/_build/html

.github/workflows/nightly.yml

@@ -0,0 +1,48 @@
+name: Nightly
+
+on:
+  schedule:
+    # Run (on default branch only) at 05:00 (hr:mm) UTC -> 12am EST
+    - cron: "0 5 * * *"
+  workflow_dispatch:
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    defaults:
+      run:
+        shell: bash
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ['3.10', '3.11', '3.12']
+        os: [ubuntu-latest, macos-latest, macos-13, windows-latest]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install uv for faster builds
+        run: |
+          curl -LsSf https://astral.sh/uv/install.sh | sh
+
+      - name: Install PoreSpy (macOS)
+        if : (matrix.os == 'macos-latest') || (matrix.os == 'macos-13')
+        run: |
+            python -m pip install --upgrade pip
+            uv pip install --system -e .[test,extras-macos]
+
+      - name: Install PoreSpy (Windows, Linux)
+        if : (matrix.os != 'macos-latest') && (matrix.os != 'macos-13')
+        run: |
+            python -m pip install --upgrade pip
+            uv pip install --system -e .[test,extras]            
+
+      - name: Run tests
+        run: |
+          pytest -v