Merge branch 'master' of github.com:BrickSchema/py-brickschema

Author: gtfierro

.github/workflows/builds.yml

@@ -13,40 +13,26 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Install Poetry
-        uses: snok/install-poetry@v1
+      - name: Install uv and set the python version
+        uses: astral-sh/setup-uv@v6
         with:
-          virtualenvs-create: true
-          virtualenvs-in-project: true
-          installer-parallel: true
+          python-version: ${{ matrix.python-version }}
+          # Enable caching for uv
+          enable-cache: true
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'
-      - name: Load cached venv
-        id: cached-poetry-dependencies
-        uses: actions/cache@v4
-        with:
-          path: .venv
-          key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
-      - name: Install dependencies for Python 3.11
-        # we do *not* install the dedupe extra because its dependency on PyLBFGS requires an older version
-        # of Cython that is not available in python 3.11
-        if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' && matrix.python-version == '3.11'
-        run: poetry install --no-interaction --no-root -E allegro -E brickify -E web -E orm -E reasonable -E persistence -E bacnet -E networkx
       - name: Install all dependencies for other Python versions
-        if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' && matrix.python-version != '3.11'
-        run: poetry install --no-interaction --no-root --all-extras
+        run: uv sync --all-extras
       - name: Run tests
-        run: |
-          source .venv/bin/activate
-          pytest -s -vvvv
+        run: uv run pytest -s -vvvv
 

pyproject.toml

@@ -8,12 +8,14 @@ homepage = "https://brickschema.org"
 license = "BSD-3-Clause"
 readme = "README.md"
 dependencies = [
+    "importlib-resources>=6.5.2",
     "owlrl>=7.1.3",
     "pyontoenv>=0.3.0a7",
     "pyshacl>=0.30.1",
     "rdflib>=7.1.4",
     "requests>=2.32.4",
 ]
+requires-python = ">=3.10,<4.0"
 
 [project.optional-dependencies]
 allegro = [
@@ -50,6 +52,13 @@ bacnet = [
     "bac0>=2025.6.10",
 ]
 networkx = [
-    "networkx>=3.5",
+    "networkx>=3.0",
+]
+topquadrant = [
+    "brick-tq-shacl>=0.4.0a8",
 ]
 
+[dependency-groups]
+dev = [
+    "pytest>=8.4.1",
+]