Updates to CI/CD

Author: bluemellophone

.github/workflows/docker-publish.yaml

@@ -47,6 +47,13 @@ jobs:
           username: ${{ vars.BATBOT_DOCKERHUB_USERNAME }}
           password: ${{ secrets.BATBOT_DOCKERHUB_TOKEN }}
 
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       # Push tagged image (version tag + latest) to registries
       - name: Tagged Docker Hub
         if: ${{ github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v') }}
@@ -71,6 +78,7 @@ jobs:
         run: |
           docker buildx build \
               -t kitware/batbot:${{ env.IMAGE_TAG }} \
+              -t ghcr.io/Kitware/batbot:${{ env.IMAGE_TAG }} \
               --platform linux/amd64 \
               --push \
               .
@@ -81,6 +89,7 @@ jobs:
         run: |
           docker buildx build \
               -t kitware/batbot:latest \
+              -t ghcr.io/Kitware/batbot:latest \
               --platform linux/amd64 \
               --push \
               .

.github/workflows/python-publish.yaml

@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        python-version: [3.8]
+        python-version: [3.12]
 
     steps:
       - name: Checkout code
@@ -35,6 +35,7 @@ jobs:
 
       - uses: actions/upload-artifact@v6
         with:
+          name: artifact-wheel-${{ matrix.os }}-${{ matrix.python-version }}
           path: ./dist/*.whl
 
   build_sdist:
@@ -59,6 +60,7 @@ jobs:
 
       - uses: actions/upload-artifact@v6
         with:
+          name: artifact-sdist
           path: ./dist/*.tar.gz
 
   test_wheel:
@@ -75,7 +77,6 @@ jobs:
 
       - uses: actions/download-artifact@v7
         with:
-          name: artifact
           path: dist
 
       - name: Install wheel

.github/workflows/testing.yaml

@@ -36,12 +36,10 @@ jobs:
           pip install -r requirements/runtime.txt
           pip install -r requirements/optional.txt
 
-      - name: Lint with flake8
+      - name: Check with pre-commit
         run: |
-          # stop the build if there are Python syntax errors or undefined names
-          flake8 . --count --show-source --statistics
-          # exit-zero treats all errors as warnings.
-          flake8 . --count --exit-zero --max-complexity=10 --statistics
+          pre-commit
+          pre-commit run --all-files
 
       - name: Run tests
         run: |

Dockerfile

@@ -30,15 +30,16 @@ RUN python3 -m venv /venv
 
 # hadolint ignore=DL3003,DL3013
 RUN /venv/bin/pip install --no-cache-dir -r requirements/runtime.txt \
- && /venv/bin/pip install --no-cache-dir -r requirements/optional.txt \
  && cd tpl/pyastar2d/ \
  && /venv/bin/pip install --no-cache-dir -e . \
  && cd ../.. \
- && /venv/bin/pip install --no-cache-dir -e . \
- && if [ "$(uname -m)" != "aarch64" ] \
-       ; then \
-       /venv/bin/pip uninstall -y onnxruntime \
-       /venv/bin/pip install --no-cache-dir onnxruntime-gpu \
-       ; fi
+ && /venv/bin/pip install --no-cache-dir -e .
+
+ # && /venv/bin/pip install --no-cache-dir -r requirements/optional.txt \
+ # && if [ "$(uname -m)" != "aarch64" ] \
+ #       ; then \
+ #       /venv/bin/pip uninstall -y onnxruntime \
+ #       /venv/bin/pip install --no-cache-dir onnxruntime-gpu \
+ #       ; fi
 
 CMD [".", "/venv/bin/activate", "&&", "exec", "python", "app.py"]

requirements/optional.txt

@@ -2,10 +2,13 @@ black
 codecov
 coverage
 flake8
+gradio
 imageio
 ipython
+isort
 line_profiler
 onnx
+onnxruntime
 pre-commit
 pytest
 pytest-benchmark[histogram]
@@ -15,7 +18,12 @@ pytest-profiling
 pytest-random-order
 pytest-sugar
 pytest-xdist
+pyupgrade
 pyyaml
+rstcheck
+rstcheck[sphinx]
 Sphinx>=5,<6
 sphinx_rtd_theme
+torch
+torchvision
 xdoctest

requirements/runtime.txt

@@ -1,19 +1,12 @@
 click
-codecov
-coverage
 cryptography
 cython
-gradio
-imgaug
 librosa
 matplotlib
 numpy
-onnxruntime
 opencv-python-headless
 Pillow
 pooch
 rich
 sphinx-click
-torch
-torchvision
 tqdm