Housekeeping (#46)

* Lint with ruff

* move to pyproject.toml

* Workflow changes.

* 3.9 - 3.12 now.

* get rid of distutils.

* intersphinx to main

* Works here.

.github/workflows/lint-every-pr.yml

@@ -2,19 +2,13 @@ name: lint-every-pr
 on:
   pull_request:
     branches:
-      - master
+      - main
 jobs:
   lint:
    runs-on: ubuntu-latest
    steps:
-     - uses: actions/checkout@v2
+     - uses: actions/checkout@v4
+     - uses: chartboost/ruff-action@v1
+     - uses: chartboost/ruff-action@v1
        with:
-         fetch-depth: 0
-     - uses: github/super-linter/slim@v4
-       env:
-         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-         DEFAULT_BRANCH: master
-         VALIDATE_ALL_CODEBASE: false
-         VALIDATE_PYTHON_BLACK: true
-         VALIDATE_PYTHON_FLAKE8: true
-         VALIDATE_PYTHON_PYLINT: true
+         args: "format --check"

.github/workflows/pull-request-commit.yml

@@ -1,75 +1,40 @@
 name: pull-request-commit
 on:
   pull_request:
-    branches:
-      - master
+    branches: ['main']
 jobs:
   build:
     strategy:
       matrix:
-        pyver: ['3.8', '3.9', '3.10']
-        os: ['ubuntu-latest', 'windows-latest']
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.pyver }}
-      - uses: ./.github/workflows/before-job
-      - uses: ./.github/workflows/build-job
-      - uses: actions/upload-artifact@v2
-        with: 
-          name: dist-${{ matrix.os }}-${{ matrix.pyver }}
-          path: dist
+        pyver: ['3.9', '3.10', '3.11', '3.12']
+        os: ['ubuntu-latest']
+        include:
+          - pyver: '3.9'
+            os: 'windows-latest'
+    uses: ./.github/workflows/workflow-build.yml
+    with:
+      pyver: ${{ matrix.pyver }}
+      os: ${{ matrix.os }}
   test:
     needs: [build]
     strategy:
       matrix:
-        pyver: ['3.8', '3.9', '3.10']
-        os: ['ubuntu-latest', 'windows-latest']
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.pyver }}
-      - uses: ./.github/workflows/before-job
-      - uses: actions/download-artifact@v2
-        with:
-          name: dist-${{ matrix.os }}-${{ matrix.pyver }}
-      - uses: jannekem/run-python-script-action@v1
-        with:
-          script: |
-            import os
-            import subprocess
-            fn = [f for f in os.listdir() if f.endswith('whl') and f.startswith('dgbowl')][0]
-            subprocess.run(["pip", "install", f"{fn}[testing]"])
-      - uses: ./.github/workflows/test-job
+        pyver: ['3.9', '3.10', '3.11', '3.12']
+        os: ['ubuntu-latest']
+        include:
+          - pyver: '3.9'
+            os: 'windows-latest'
+    uses: ./.github/workflows/workflow-test.yml
+    with:
+      pyver: ${{ matrix.pyver }}
+      os: ${{ matrix.os }}
   pages:
     needs: [build]
     strategy:
       matrix:
         pyver: ['3.9']
         os: ['ubuntu-latest']
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.pyver }}
-      - uses: ./.github/workflows/before-job
-      - uses: actions/download-artifact@v2
-        with:
-          name: dist-${{ matrix.os }}-${{ matrix.pyver }}
-      - uses: jannekem/run-python-script-action@v1
-        with:
-          script: |
-            import os
-            import subprocess
-            fn = [f for f in os.listdir() if f.endswith('whl') and f.startswith('dgbowl')][0]
-            subprocess.run(["pip", "install", f"{fn}[docs]"])
-      - uses: ./.github/workflows/docs-job
-      - uses: actions/upload-artifact@v2
-        with: 
-          name: public-${{ matrix.os }}-${{ matrix.pyver }}
-          path: public
+    uses: ./.github/workflows/workflow-pages.yml
+    with:
+      pyver: ${{ matrix.pyver }}
+      os: ${{ matrix.os }}

.github/workflows/push-main.yml

@@ -0,0 +1,39 @@
+name: push-main
+on:
+  push:
+    branches: ['main']
+jobs:
+  build:
+        uses: ./.github/workflows/workflow-build.yml
+        with:
+            pyver: '3.9'
+            os: 'ubuntu-latest'
+  test:
+    needs: [build]
+    uses: ./.github/workflows/workflow-test.yml
+    with:
+      pyver: '3.9'
+      os: 'ubuntu-latest'
+  pages:
+    needs: [build]
+    uses: ./.github/workflows/workflow-pages.yml
+    with:
+      pyver: '3.9'
+      os: ubuntu-latest
+  deploy:
+    needs: [pages]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+            python-version: '3.9'
+      - uses: actions/download-artifact@v4
+        with:
+            name: public-ubuntu-latest-3.9
+            path: public/main
+      - uses: peaceiris/actions-gh-pages@v3
+        with:
+            github_token: ${{ secrets.GITHUB_TOKEN }}
+            publish_dir: ./public
+            keep_files: true

.github/workflows/workflow-build.yml

@@ -0,0 +1,35 @@
+---
+name: Build schemas
+on:
+    workflow_call:
+        inputs:
+            os:
+                required: true
+                type: string
+            pyver:
+                required: true
+                type: string
+
+jobs:
+    build:
+        runs-on: ${{ inputs.os }}
+        steps:
+          - uses: actions/checkout@v4
+            with:
+                fetch-depth: 0
+          - uses: actions/setup-python@v5
+            with:
+                python-version: ${{ inputs.pyver }}
+          - name: Install dependencies
+            shell: bash
+            run: |
+                python -m pip install --upgrade pip
+                pip install -U setuptools build
+          - name: Build dgbowl schemas
+            shell: bash
+            run: |
+                python -m build
+          - uses: actions/upload-artifact@v4
+            with:
+                name: dist-${{ inputs.os }}-${{ inputs.pyver }}
+                path: dist

.github/workflows/workflow-pages.yml

@@ -0,0 +1,39 @@
+---
+name: Build docs
+on:
+    workflow_call:
+        inputs:
+            os:
+                required: true
+                type: string
+            pyver:
+                required: true
+                type: string
+
+jobs:
+    pages:
+        runs-on: ${{ inputs.os }}
+        steps:
+          - uses: actions/checkout@v4
+          - uses: actions/setup-python@v5
+            with:
+                python-version: ${{ inputs.pyver }}
+          - uses: actions/download-artifact@v4
+            with:
+                name: dist-${{ inputs.os }}-${{ inputs.pyver }}
+          - uses: jannekem/run-python-script-action@v1
+            with:
+                script: |
+                    import os
+                    import subprocess
+                    fn = [f for f in os.listdir() if f.endswith('whl') and f.startswith('dgbowl_schemas')][0]
+                    subprocess.run(["pip", "install", f"{fn}[docs]"])
+          - name: Build the docs
+            shell: bash
+            run: |
+                sphinx-apidoc -o docs/source/apidoc src/dgbowl_schemas -T -M -f --templatedir=docs/apidoc_t
+                sphinx-build -W -b html docs/source public/main
+          - uses: actions/upload-artifact@v4
+            with:
+              name: public-${{ inputs.os }}-${{ inputs.pyver }}
+              path: public/main