diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 35d00524..4e795f8e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,18 +17,21 @@ jobs: uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - sudo apt-get update - sudo apt-get install -y bats gcc - python -m pip install --upgrade pip - - name: Lint - run: ./tests/run_linters.sh - name: Unit tests run: ./tests/run_unit_tests.sh - name: Integration tests run: ./tests/run_integration_tests.sh + lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-python@v3 + with: + python-version: "3.x" + - name: Lint + run: ./tests/run_linters.sh + check-docs: runs-on: ubuntu-latest steps: diff --git a/examples/gen_readme.py b/examples/gen_readme.py index 8d12f1f0..9153b4d7 100755 --- a/examples/gen_readme.py +++ b/examples/gen_readme.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 """Generate the dockerfiles from a jinja template.""" from pathlib import Path -from jinja2 import Environment, FileSystemLoader, Markup +from jinja2 import Environment, FileSystemLoader +from markupsafe import Markup import os import yaml diff --git a/examples/ok-with-mkdocstrings/module.grepout b/examples/ok-with-mkdocstrings/module.grepout index bd64588e..6f5d86bc 100644 --- a/examples/ok-with-mkdocstrings/module.grepout +++ b/examples/ok-with-mkdocstrings/module.grepout @@ -9,7 +9,7 @@ documentation!

-module.main() +module.main()

diff --git a/requirements.txt b/requirements.txt index deec1d71..490d1f9a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,11 @@ -click==8.0.4 +click==8.1.2 flake8==4.0.1 mkdocs-awesome-pages-plugin==2.7.0 -mkdocs-macros-plugin==0.6.4 -mkdocs-material==8.2.6 -mkdocs==1.2.3 +mkdocs-macros-plugin==0.7.0 +mkdocs-material==8.2.8 +mkdocs==1.3.0 mkdocstrings==0.18.1 pip-upgrader==1.4.15 pydocstyle==6.1.1 pymdown-extensions==9.3 +MarkupSafe==2.1.1 diff --git a/tests/generator_test.py b/tests/generator_test.py index 38c94cdb..f0ed461c 100755 --- a/tests/generator_test.py +++ b/tests/generator_test.py @@ -111,9 +111,9 @@ def test_theme(self): """ self._test_env_setting( env_variable="THEME", - env_value="material", + env_value="readthedocs", config_name="theme", - config_value={"name": "material"}, + config_value={"name": "readthedocs"}, loaded_type=theme.Theme) diff --git a/tests/run_integration_tests.sh b/tests/run_integration_tests.sh index c582ee1b..2078679c 100755 --- a/tests/run_integration_tests.sh +++ b/tests/run_integration_tests.sh @@ -1,8 +1,8 @@ #!/bin/bash set -e sudo apt-get install bats -pip install -r requirements.txt pip install -e . +pip install mkdocs-macros-plugin mkdocstrings # md file="test.snippet" # ### Integration tests # diff --git a/tests/run_unit_tests.sh b/tests/run_unit_tests.sh index fdfe4743..fcc3157d 100755 --- a/tests/run_unit_tests.sh +++ b/tests/run_unit_tests.sh @@ -1,6 +1,5 @@ #!/bin/bash set -e -pip install -r requirements.txt pip install -e . # md file="test.snippet" # ### Unit tests diff --git a/tests/test_local.sh b/tests/test_local.sh index 9bdeaf25..4dc2b38d 100755 --- a/tests/test_local.sh +++ b/tests/test_local.sh @@ -23,8 +23,6 @@ function docker_run_integration_tests() { docker build -t mkdocs-simple-test-runner:$1 -f- . <