Merge branch 'scribe-org:main' into Expand-Bokmål-verbs-query

scribe-org · Oct 21, 2024 · db2a20d · db2a20d
2 parents 3579315 + ee2ec76
commit db2a20d
Show file tree

Hide file tree

Showing 273 changed files with 2,380 additions and 985 deletions.
diff --git a/.github/workflows/check_project_structure.yaml b/.github/workflows/check_project_structure.yaml
@@ -8,12 +8,33 @@ on:
 
 jobs:
   structure-check:
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+        python-version:
+          - "3.9"
+
+    runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Add project root to PYTHONPATH
+        run: echo "PYTHONPATH=$(pwd)/src" >> $GITHUB_ENV
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+
       - name: Run check_project_structure.py
         working-directory: ./src/scribe_data/check
         run: python check_project_structure.py

diff --git a/.github/workflows/check_query_identifiers.yaml b/.github/workflows/check_query_identifiers.yaml
@@ -3,8 +3,7 @@ on:
   push:
     branches: [main]
   pull_request:
-    branches:
-      - main
+    branches: [main]
     types: [opened, reopened, synchronize]
 
 jobs:
@@ -22,24 +21,26 @@ jobs:
     name: Run Check Query Identifiers
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      # - name: Set up Python ${{ matrix.python-version }}
-      #   uses: actions/setup-python@v4
-      #   with:
-      #     python-version: ${{ matrix.python-version }}
-
-      # - name: Install dependencies
-      #   run: |
-      #     python -m pip install --upgrade uv
-      #     uv venv
-      #     uv pip install -r requirements.txt
-
-      # - name: Activate virtualenv
-      #   run: |
-      #     . .venv/bin/activate
-      #     echo PATH=$PATH >> $GITHUB_ENV
-
-      # - name: Run Python script
-      #   run: python src/scribe_data/check/check_query_identifiers.py
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Add project root to PYTHONPATH
+        run: echo "PYTHONPATH=$(pwd)/src" >> $GITHUB_ENV
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+
+      - name: Run check_query_identifiers.py
+        working-directory: ./src/scribe_data/check
+        run: python check_query_identifiers.py
+
+      - name: Post-run status
+        if: failure()
+        run: echo "Project SPARQL queries check failed. Please fix the reported errors."
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -15,8 +15,7 @@
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-#
-import sphinx_rtd_theme
+
 
 sys.path.insert(0, os.path.abspath("../../src"))
 
@@ -36,7 +35,7 @@
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    "m2r2",
+    # "m2r2",
     "sphinx.ext.autodoc",
     "numpydoc",
     "sphinx.ext.viewcode",
@@ -80,6 +79,7 @@
 # source_suffix = ['.rst', '.md']
 source_suffix = ".rst"
 
+
 # The master toctree document.
 master_doc = "index"
 
@@ -91,7 +91,8 @@
 
 html_theme = "sphinx_rtd_theme"
 
-html_theme_path = [sphinx_rtd_theme]
+# html_theme_path = [sphinx_rtd_theme]
+# html_theme_path = []
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the