pytest-codeblock 0.1.6__tar.gz → 0.1.8__tar.gz

{pytest_codeblock-0.1.6/pytest_codeblock.egg-info → pytest_codeblock-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-codeblock
-Version: 0.1.6
+Version: 0.1.8
 Summary: Pytest plugin to collect and test code blocks in reStructuredText and Markdown files.
 Author-email: Artur Barseghyan <artur.barseghyan@gmail.com>
 Maintainer-email: Artur Barseghyan <artur.barseghyan@gmail.com>
@@ -128,8 +128,7 @@ Features
 - **Grouping by name**: Split a single example across multiple code blocks;
   the plugin concatenates them into one test.
 - **Pytest markers support**: Add existing or custom `pytest`_ markers
-  to the code blocks and add hook into the tests life-cycle
-  using ``conftest.py``.
+  to the code blocks and hook into the tests life-cycle using ``conftest.py``.
 
 Prerequisites
 =============

{pytest_codeblock-0.1.6 → pytest_codeblock-0.1.8}/README.rst

@@ -69,8 +69,7 @@ Features
 - **Grouping by name**: Split a single example across multiple code blocks;
   the plugin concatenates them into one test.
 - **Pytest markers support**: Add existing or custom `pytest`_ markers
-  to the code blocks and add hook into the tests life-cycle
-  using ``conftest.py``.
+  to the code blocks and hook into the tests life-cycle using ``conftest.py``.
 
 Prerequisites
 =============

{pytest_codeblock-0.1.6 → pytest_codeblock-0.1.8}/pyproject.toml

@@ -2,7 +2,7 @@
 name = "pytest-codeblock"
 description = "Pytest plugin to collect and test code blocks in reStructuredText and Markdown files."
 readme = "README.rst"
-version = "0.1.6"
+version = "0.1.8"
 requires-python = ">=3.9"
 dependencies = [
     "pytest",
@@ -85,9 +85,10 @@ pytest_codeblock = "pytest_codeblock"
 
 [tool.setuptools]
 # No single-file modules; we use packages.find below
+package-dir = {"" = "src"}
 
 [tool.setuptools.packages.find]
-where = ["."]
+where = ["src"]
 include = ["pytest_codeblock", "pytest_codeblock.*"]
 
 [build-system]
@@ -119,7 +120,7 @@ lint.ignore = [
 ]
 # Enable auto-fix for formatting and import sorting
 fix = true
-src = ["pytest_codeblock"]
+src = ["src/pytest_codeblock"]
 exclude = [
     ".bzr",
     ".direnv",
@@ -155,7 +156,7 @@ known-third-party  = []
 [tool.doc8]
 ignore-path = [
     "docs/requirements.txt",
-    "pytest-codeblock.egg-info/SOURCES.txt",
+    "src/pytest-codeblock.egg-info/SOURCES.txt",
 ]
 
 [tool.pytest.ini_options]
@@ -183,6 +184,7 @@ testpaths = [
     "**/*.md",
 ]
 pythonpath = [
+    "src",
     "examples/md_example",
     "examples/rst_example",
 ]

{pytest_codeblock-0.1.6 → pytest_codeblock-0.1.8/src}/pytest_codeblock/__init__.py

@@ -2,7 +2,7 @@ from .md import MarkdownFile
 from .rst import RSTFile
 
 __title__ = "pytest-codeblock"
-__version__ = "0.1.6"
+__version__ = "0.1.8"
 __author__ = "Artur Barseghyan <artur.barseghyan@gmail.com>"
 __copyright__ = "2025 Artur Barseghyan"
 __license__ = "MIT"

{pytest_codeblock-0.1.6 → pytest_codeblock-0.1.8/src}/pytest_codeblock/rst.py

@@ -2,7 +2,7 @@ import re
 import textwrap
 import traceback
 from pathlib import Path
-from typing import Optional
+from typing import Optional, Union
 
 import pytest
 
@@ -21,7 +21,7 @@ __all__ = (
 
 
 def resolve_literalinclude_path(
-    base_dir: Path,
+    base_dir: Union[str, Path],
     include_path: str,
 ) -> Optional[str]:
     """
@@ -29,12 +29,18 @@ def resolve_literalinclude_path(
     Returns None if the file doesn't exist.
     """
     _include_path = Path(include_path)
+
+    # If `include_path` is already absolute or relative and exists, done
     if _include_path.exists():
         return str(_include_path.resolve())
 
-    _base_dir = Path(base_dir.dirname) if base_dir.is_file() else base_dir
+    # If base_path is a file, switch to its parent directory
+    _base_path = Path(base_dir)
+    if _base_path.is_file():
+        _base_path = _base_path.parent
+
     try:
-        full_path = _base_dir / include_path
+        full_path = _base_path / include_path
         if full_path.exists():
             return str(full_path.resolve())
     except Exception:

pytest_codeblock-0.1.8/src/pytest_codeblock/tests/test_pytest_codeblock.py

@@ -0,0 +1,108 @@
+from pytest_codeblock.collector import CodeSnippet, group_snippets
+from pytest_codeblock.md import parse_markdown
+from pytest_codeblock.rst import (
+    get_literalinclude_content,
+    parse_rst,
+    resolve_literalinclude_path,
+)
+
+
+def test_group_snippets_merges_named():
+    # Two snippets with the same name should be combined
+    sn1 = CodeSnippet(name="foo", code="a=1", line=1, marks=["codeblock"])
+    sn2 = CodeSnippet(name="foo", code="b=2", line=2, marks=["codeblock", "m"])
+    combined = group_snippets([sn1, sn2])
+    assert len(combined) == 1
+    cs = combined[0]
+    assert cs.name == "foo"
+    # Both code parts should appear
+    assert "a=1" in cs.code
+    assert "b=2" in cs.code
+    # Marks should accumulate
+    assert "m" in cs.marks
+
+
+def test_group_snippets_different_names():
+    # Snippets with different names are not grouped
+    sn1 = CodeSnippet(name="foo", code="x=1", line=1)
+    sn2 = CodeSnippet(name="bar", code="y=2", line=2)
+    combined = group_snippets([sn1, sn2])
+    assert len(combined) == 2
+    assert combined[0].name.startswith("foo")
+    assert combined[1].name.startswith("bar")
+
+
+def test_parse_markdown_simple():
+    text = """
+```python name=test_example
+x=1
+assert x==1
+```"""
+    snippets = parse_markdown(text)
+    assert len(snippets) == 1
+    sn = snippets[0]
+    assert sn.name == "test_example"
+    assert "x=1" in sn.code
+
+
+def test_parse_markdown_with_pytestmark():
+    text = """
+<!-- pytestmark: django_db -->
+```python name=test_db
+from django.db import models
+```"""
+    snippets = parse_markdown(text)
+    assert len(snippets) == 1
+    sn = snippets[0]
+    # Should include both default and django_db marks
+    assert "django_db" in sn.marks
+    assert "codeblock" in sn.marks
+
+
+def test_resolve_literalinclude_and_content(tmp_path):
+    base = tmp_path / "dir"
+    base.mkdir()
+    file = base / "a.py"
+    file.write_text("print('hello')")
+    # Absolute path resolution
+    abs_path = resolve_literalinclude_path(base, str(file))
+    assert abs_path == str(file.resolve())
+    # Relative path resolution
+    rel_path = resolve_literalinclude_path(base, "a.py")
+    assert rel_path == str(file.resolve())
+    # Content read
+    content = get_literalinclude_content(str(file))
+    assert content == "print('hello')"
+
+
+def test_parse_rst_simple(tmp_path):
+    # Basic code-block directive
+    rst = """
+.. code-block:: python
+   :name: test_simple
+
+   a=2
+   assert a==2
+"""
+    snippets = parse_rst(rst, tmp_path)
+    assert len(snippets) == 1
+    sn = snippets[0]
+    assert sn.name == "test_simple"
+    assert "a=2" in sn.code
+
+
+def test_parse_rst_literalinclude(tmp_path):
+    # Create an external file to include
+    include_dir = tmp_path / "inc"
+    include_dir.mkdir()
+    target = include_dir / "foo.py"
+    target.write_text("z=3\nassert z==3")
+    rst = f"""
+.. literalinclude:: {target.name}
+   :name: test_li
+"""
+    snippets = parse_rst(rst, include_dir)
+    assert len(snippets) == 1
+    sn = snippets[0]
+    assert sn.name == "test_li"
+    assert "z=3" in sn.code

{pytest_codeblock-0.1.6 → pytest_codeblock-0.1.8/src/pytest_codeblock.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-codeblock
-Version: 0.1.6
+Version: 0.1.8
 Summary: Pytest plugin to collect and test code blocks in reStructuredText and Markdown files.
 Author-email: Artur Barseghyan <artur.barseghyan@gmail.com>
 Maintainer-email: Artur Barseghyan <artur.barseghyan@gmail.com>
@@ -128,8 +128,7 @@ Features
 - **Grouping by name**: Split a single example across multiple code blocks;
   the plugin concatenates them into one test.
 - **Pytest markers support**: Add existing or custom `pytest`_ markers
-  to the code blocks and add hook into the tests life-cycle
-  using ``conftest.py``.
+  to the code blocks and hook into the tests life-cycle using ``conftest.py``.
 
 Prerequisites
 =============

pytest_codeblock-0.1.8/src/pytest_codeblock.egg-info/SOURCES.txt

@@ -0,0 +1,16 @@
+LICENSE
+README.rst
+pyproject.toml
+src/pytest_codeblock/__init__.py
+src/pytest_codeblock/collector.py
+src/pytest_codeblock/constants.py
+src/pytest_codeblock/md.py
+src/pytest_codeblock/rst.py
+src/pytest_codeblock.egg-info/PKG-INFO
+src/pytest_codeblock.egg-info/SOURCES.txt
+src/pytest_codeblock.egg-info/dependency_links.txt
+src/pytest_codeblock.egg-info/entry_points.txt
+src/pytest_codeblock.egg-info/requires.txt
+src/pytest_codeblock.egg-info/top_level.txt
+src/pytest_codeblock/tests/__init__.py
+src/pytest_codeblock/tests/test_pytest_codeblock.py

pytest_codeblock-0.1.6/pytest_codeblock.egg-info/SOURCES.txt

@@ -1,14 +0,0 @@
-LICENSE
-README.rst
-pyproject.toml
-pytest_codeblock/__init__.py
-pytest_codeblock/collector.py
-pytest_codeblock/constants.py
-pytest_codeblock/md.py
-pytest_codeblock/rst.py
-pytest_codeblock.egg-info/PKG-INFO
-pytest_codeblock.egg-info/SOURCES.txt
-pytest_codeblock.egg-info/dependency_links.txt
-pytest_codeblock.egg-info/entry_points.txt
-pytest_codeblock.egg-info/requires.txt
-pytest_codeblock.egg-info/top_level.txt