Release v0.5.12 (#59)

* Bump abatilo/actions-poetry from 2.1.6 to 2.3.0

Bumps [abatilo/actions-poetry](https://github.com/abatilo/actions-poetry) from 2.1.6 to 2.3.0.
- [Release notes](https://github.com/abatilo/actions-poetry/releases)
- [Changelog](https://github.com/abatilo/actions-poetry/blob/master/.releaserc)
- [Commits](abatilo/actions-poetry@v2.1.6...v2.3.0)

---
updated-dependencies:
- dependency-name: abatilo/actions-poetry
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump mkdocstrings from 0.19.1 to 0.25.1

Bumps [mkdocstrings](https://github.com/mkdocstrings/mkdocstrings) from 0.19.1 to 0.25.1.
- [Release notes](https://github.com/mkdocstrings/mkdocstrings/releases)
- [Changelog](https://github.com/mkdocstrings/mkdocstrings/blob/main/CHANGELOG.md)
- [Commits](mkdocstrings/mkdocstrings@0.19.1...0.25.1)

---
updated-dependencies:
- dependency-name: mkdocstrings
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* (chore) lock update and update in CICD (#35)

* (chore) lock update and update in CICD
* (chore) updated preprocessor and added testing
* (chore) updated pre commit hooks and versions
* (chore) updated test to match boostrap distro, improved test error msg.
* (chore) upgraded missing versions of checkout and python setup in cicd

* Bump mdformat-frontmatter from 0.4.1 to 2.0.8 (#41)

Bumps [mdformat-frontmatter](https://github.com/butler54/mdformat-frontmatter) from 0.4.1 to 2.0.8.
- [Release notes](https://github.com/butler54/mdformat-frontmatter/releases)
- [Changelog](https://github.com/butler54/mdformat-frontmatter/blob/main/CHANGELOG.md)
- [Commits](butler54/mdformat-frontmatter@v0.4.1...v2.0.8)

---
updated-dependencies:
- dependency-name: mdformat-frontmatter
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: add support for arbitrary separator repetitions (#58)

* fix: add support for arbitrary separator repetitions
* chore: migrate to uv
* chore: updated pre commit hooks to remove poetry

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Author: jspaezp

.github/workflows/CICD.yml

@@ -14,42 +14,20 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      # Python setup
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.x'
-
-      - name: Debug Info
-        run: echo ${{ github.ref }} ${{ github.event_name }} ${{ endsWith(github.ref, 'heads/release') && (github.event_name == 'push') }}
-        # refs/heads/main push false is the output of the main branch when tagged with a release ...
-
-      - name: View Python --version
-        run: python --version
-
-      # Poetry Setup
-      - name: Python Poetry Action
-        uses: abatilo/[email protected]
-        with:
-          poetry-version: '1.7.1'
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
 
-      - name: View poetry --version
-        run: poetry --version
-      - name: Install Stuff
-        run: poetry install --no-root --only check
       - name: Black
-        run: poetry run python -m black . --check --diff
+        run: uv run --group lint python -m black . --check --diff
       - name: ruff
-        run: poetry run ruff check .
-      - name: isort
-        run: poetry run isort . --check
+        run: uv run --group lint ruff check .
 
   ci:
     needs: cheap_checks
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ '3.9', '3.11', '3.12' ]
-        poetry-version: [ '1.7.1' ]
+        python-version: [ '3.10', '3.11', '3.12' ]
         os: [ 'ubuntu-latest' ]
     runs-on: ${{ matrix.os }}
     steps:
@@ -62,31 +40,24 @@ jobs:
       - name: View Quarto version
         run: quarto --version
 
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+
       # Python setup
-      - uses: actions/setup-python@v5
+      - name: Install uv and set the python version
+        uses: astral-sh/setup-uv@v5
         with:
           python-version: ${{ matrix.python-version }}
+
       - name: View Python --version
         run: python --version
 
-      # Poetry Setup
-      - name: Python Poetry Action
-        uses: abatilo/[email protected]
-        with:
-          poetry-version: ${{ matrix.poetry-version }}
-      - name: View poetry --version
-        run: poetry --version
-
-      # Package Setup
-      - name: Install deps
-        run: poetry install -n -v --all-extras
-
       # CI checks
       - name: Pytest
-        run: poetry run python -m pytest --cov . --cov-report=xml
+        run: uv run --all-groups python -m pytest --cov . --cov-report=xml
 
       - name: mkdocs
-        run: poetry run python -m mkdocs build --strict
+        run: uv run --all-groups python -m mkdocs build --strict
 
       - uses: codecov/codecov-action@v4
         with:
@@ -110,39 +81,31 @@ jobs:
         run: quarto --version
 
       # Python setup
-      - uses: actions/setup-python@v5
+      - name: Install uv and set the python version
+        uses: astral-sh/setup-uv@v5
         with:
           python-version: '3.x'
-      - name: View Python --version
-        run: python --version
-
-      # Poetry Setup
-      - name: Python Poetry Action
-        uses: abatilo/[email protected]
-        with:
-          poetry-version: '1.7.1'
-      - name: View poetry --version
-        run: poetry --version
 
-      # Package Setup
-      - name: Install deps
-        run: poetry install -n -v --all-extras
+      - name: View Python --version
+        run: uv run python --version
 
       - name: Build package
         run: |
-          poetry build
+          uv run --all-groups python -m build
 
       # Publishing Docs
       - name: Deploy Docs
         run: |
-          poetry run python -m mkdocs gh-deploy --strict --force
+          uv run python -m mkdocs gh-deploy --strict --force
 
-      # Publish Package
-      - name: Publish Setup
-        env:
-          PYPITOKEN: ${{ secrets.PYPITOKEN }}
+      - name: Build package
         run: |
-          poetry config pypi-token.pypi ${PYPITOKEN}
-      - name: Publish
+          uv run python -m build
+      
+      - name: Publish to PyPI
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.PYPITOKEN }}
         run: |
-          poetry publish --no-interaction
+          python -m twine upload --non-interactive dist/*
+

.pre-commit-config.yaml

@@ -32,29 +32,16 @@ repos:
       - id: pydocstyle
         additional_dependencies:
           - toml
-  - repo: https://github.com/python-poetry/poetry
-    rev: 1.8.0 # add version here
-    hooks:
-      - id: poetry-check
-      - id: poetry-lock
-      - id: poetry-export
-        args: [ "-f", "requirements.txt", "-o", "requirements.txt" ]
   - repo: local
     hooks:
-      - id: isort
-        name: isort
-        entry: poetry run isort .
-        language: system
-        always_run: true
-        pass_filenames: false
       - id: pydocstringformatter
         name: pydocstringformatter
-        entry: poetry run pydocstringformatter mkquartodocs
+        entry: uv run --all-groups pydocstringformatter mkquartodocs
         language: system
         always_run: true
       - id: pytest
         name: pytest-check
-        entry: poetry run python -m pytest -x
+        entry: uv run --all-groups python -m pytest -x
         language: system
         pass_filenames: false
         always_run: true

mkquartodocs/extension.py

@@ -14,12 +14,13 @@
 
 
 class AdmotionCellDataPreprocessor(Preprocessor):
-    CELL_REGEX: Final = re.compile(r"^::: \{\.cell .*}\s*$")
-    CELL_END: Final = re.compile(r"^:{3,4}?$")
+
+    CELL_REGEX: Final = re.compile(r"^(:{3,}) \{\.cell .*}\s*$")
+    CELL_END: Final = re.compile(r"^(:{3,})$")
     CELL_ELEM_REGEX: Final = re.compile(
-        r"^:{3,4} \{(\.cell(-\w+)?)\s?(\.cell-[\w-]+)?( execution_count=\"\d+\")?\}"
+        r"^(:{3,}) \{(.cell-\w+)\s?(\.cell-[\w-]+)?( execution_count=\"\d+\")?\}$"
     )
-    CODEBLOCK_REGEX: Final = re.compile(r"^```{\.(\w+) .*}")
+    CODEBLOCK_REGEX: Final = re.compile(r"^(`{3,}){\.(\w+) .*}")
 
     # https://squidfunk.github.io/mkdocs-material/reference/admonitions/#supported-types
     TYPE_MAPPING: Final = {
@@ -46,19 +47,17 @@ def _process_line(self, line):
             out = "\n\n"
 
         elif sr := self.CELL_ELEM_REGEX.search(line):
-            groups = {i: x for i, x in enumerate(sr.groups())}
-            log.debug(f"Matched Cell element: {line}, groups: {groups}")
-            if groups[3]:
-                out = "\n\n"
-            else:
-                output_type = groups[2]
-                out = self.TYPE_MAPPING[output_type]
+            grp = sr.groups()
+            log.debug(f"Matched Cell element: {line}, groups: {grp}")
+            output_type = grp[2]
+            out = self.TYPE_MAPPING[output_type]
 
         elif sr := self.CODEBLOCK_REGEX.search(line):
-            groups = {i: x for i, x in enumerate(sr.groups())}
-            log.debug(f"Matched codeblock: {line} -> {groups}")
-            lang = sr.groups(1)
-            out = f"```{lang}"
+            grp = sr.groups()
+            log.debug(f"Matched codeblock: {line}, groups: {grp}")
+            lang = grp[2]
+            nesting_level = len(grp[1])
+            out = f"{'`' * nesting_level}{lang}"
         else:
             out = line
 

mkquartodocs/plugin.py

@@ -1,4 +1,5 @@
 import re
+import time
 import shutil
 import subprocess
 import warnings
@@ -88,11 +89,12 @@ def on_pre_build(self, config):
                     except subprocess.CalledProcessError as e:
                         # ERROR: Couldn't find open server
                         # it ocasionally fails with that error ...
-                        if i == 4:
+                        if i >= 4:
                             log.error(f"Quarto failed to render {x} after 5 tries")
                             log.error(f"Quarto failed with error: {e}")
                             raise
                         warnings.warn(f"Quarto failed to render {x}, retrying")
+                        time.sleep(2)
         else:
             warnings.warn(f"No quarto files were found in directory {docs_dir}")