From 3e0adebc56a31c9ea34f03961e6060cf353c50f7 Mon Sep 17 00:00:00 2001 From: Todd Leonhardt Date: Sun, 3 Nov 2024 15:44:52 -0500 Subject: [PATCH 1/3] Try removing nox from doc build --- .github/workflows/doc.yml | 4 ++-- noxfile.py | 16 ---------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index 5349f6b2..15c1935b 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -26,6 +26,6 @@ jobs: with: python-version: ${{ matrix.python-version }} - name: Install python prerequisites - run: pip install -U --user pip setuptools setuptools-scm nox + run: pip install -U --user pip setuptools setuptools-scm sphinx sphinx-autobuild sphinx-rtd-theme - name: Sphinx documentation build - run: python -m nox --non-interactive --session docs + run: python -m sphinx -M html docs docs/_build -nvWT diff --git a/noxfile.py b/noxfile.py index dd6c524e..88045f24 100644 --- a/noxfile.py +++ b/noxfile.py @@ -1,22 +1,6 @@ import nox -@nox.session(python=['3.12']) -def docs(session): - session.install( - 'sphinx', - 'sphinx-rtd-theme', - '.', - 'plugins/ext_test', - ) - session.chdir('docs') - tmpdir = session.create_tmp() - - session.run( - 'sphinx-build', '-a', '-W', '-T', '-b', 'html', '-d', '{}/doctrees'.format(tmpdir), '.', '{}/html'.format(tmpdir) - ) - - @nox.session(python=['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']) @nox.parametrize('plugin', [None, 'ext_test', 'template', 'coverage']) def tests(session, plugin): From 4131722a0994601d82efa3a3a061811cd7ac007a Mon Sep 17 00:00:00 2001 From: Todd Leonhardt Date: Sun, 3 Nov 2024 15:54:21 -0500 Subject: [PATCH 2/3] Fix pytest run for cmd2-ext-test and try to fix doc build --- .github/workflows/doc.yml | 2 +- pyproject.toml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index 15c1935b..6fe26d4b 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -26,6 +26,6 @@ jobs: with: python-version: ${{ matrix.python-version }} - name: Install python prerequisites - run: pip install -U --user pip setuptools setuptools-scm sphinx sphinx-autobuild sphinx-rtd-theme + run: pip install -U --user pip setuptools setuptools-scm sphinx sphinx-autobuild sphinx-rtd-theme . plugins/ext_test - name: Sphinx documentation build run: python -m sphinx -M html docs docs/_build -nvWT diff --git a/pyproject.toml b/pyproject.toml index 09d0f81f..0b241d3e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,6 +35,7 @@ classifiers = [ "Topic :: Software Development :: Libraries :: Python Modules", ] dependencies = [ + "cmd2-ext-test", "gnureadline; platform_system == 'Darwin'", "pyperclip", "pyreadline3; platform_system == 'Windows'", @@ -333,3 +334,6 @@ dev-dependencies = [ "ruff", "twine", ] + +[tool.uv.sources] +cmd2-ext-test = { path = "plugins/ext_test", editable = true } From d3f7a0280375cc21203b9ade15b16a09e89906cd Mon Sep 17 00:00:00 2001 From: Todd Leonhardt Date: Sun, 3 Nov 2024 16:05:36 -0500 Subject: [PATCH 3/3] Fixed mistake where cmd2-ext-test was added as a non-dev dependency --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 0b241d3e..57c36c6a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,6 @@ classifiers = [ "Topic :: Software Development :: Libraries :: Python Modules", ] dependencies = [ - "cmd2-ext-test", "gnureadline; platform_system == 'Darwin'", "pyperclip", "pyreadline3; platform_system == 'Windows'", @@ -321,6 +320,7 @@ packages = ["cmd2"] [tool.uv] dev-dependencies = [ + "cmd2-ext-test", "codecov", "doc8", "invoke",