symbex 1.4__tar.gz → 2.0__tar.gz

{symbex-1.4 → symbex-2.0}/PKG-INFO

@@ -1,19 +1,26 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: symbex
-Version: 1.4
+Version: 2.0
 Summary: Find the Python code for specified symbols
-Home-page: https://github.com/simonw/symbex
 Author: Simon Willison
-License: Apache License, Version 2.0
+License-Expression: Apache-2.0
+Project-URL: Homepage, https://github.com/simonw/symbex
 Project-URL: Issues, https://github.com/simonw/symbex/issues
 Project-URL: CI, https://github.com/simonw/symbex/actions
 Project-URL: Changelog, https://github.com/simonw/symbex/releases
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Provides-Extra: test
 License-File: LICENSE
+Requires-Dist: click
+Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-icdiff; extra == "test"
+Requires-Dist: cogapp; extra == "test"
+Requires-Dist: PyYAML; extra == "test"
+Requires-Dist: ruff; extra == "test"
+Dynamic: license-file
 
-# symbex
+# Symbex
 
 [![PyPI](https://img.shields.io/pypi/v/symbex.svg)](https://pypi.org/project/symbex/)
 [![Changelog](https://img.shields.io/github/v/release/simonw/symbex?include_prereleases&label=changelog)](https://github.com/simonw/symbex/releases)
@@ -22,7 +29,7 @@ License-File: LICENSE
 
 Find the Python code for specified symbols
 
-Read [symbex: search Python code for functions and classes, then pipe them into a LLM](https://simonwillison.net/2023/Jun/18/symbex/) for background on this project.
+Read [Symbex: search Python code for functions and classes, then pipe them into a LLM](https://simonwillison.net/2023/Jun/18/symbex/) for background on this project.
 
 ## Installation
 

{symbex-1.4 → symbex-2.0}/README.md

@@ -1,4 +1,4 @@
-# symbex
+# Symbex
 
 [![PyPI](https://img.shields.io/pypi/v/symbex.svg)](https://pypi.org/project/symbex/)
 [![Changelog](https://img.shields.io/github/v/release/simonw/symbex?include_prereleases&label=changelog)](https://github.com/simonw/symbex/releases)
@@ -7,7 +7,7 @@
 
 Find the Python code for specified symbols
 
-Read [symbex: search Python code for functions and classes, then pipe them into a LLM](https://simonwillison.net/2023/Jun/18/symbex/) for background on this project.
+Read [Symbex: search Python code for functions and classes, then pipe them into a LLM](https://simonwillison.net/2023/Jun/18/symbex/) for background on this project.
 
 ## Installation
 

symbex-2.0/pyproject.toml

@@ -0,0 +1,32 @@
+[project]
+name = "symbex"
+version = "2.0"
+description = "Find the Python code for specified symbols"
+readme = "README.md"
+authors = [{name = "Simon Willison"}]
+license = "Apache-2.0"
+requires-python = ">=3.8"
+dependencies = [
+    "click"
+]
+
+[project.urls]
+Homepage = "https://github.com/simonw/symbex"
+Issues = "https://github.com/simonw/symbex/issues"
+CI = "https://github.com/simonw/symbex/actions"
+Changelog = "https://github.com/simonw/symbex/releases"
+
+[project.scripts]
+symbex = "symbex.cli:cli"
+
+[project.optional-dependencies]
+test = ["pytest", "pytest-icdiff", "cogapp", "PyYAML", "ruff"]
+
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["symbex"]
+

{symbex-1.4 → symbex-2.0}/symbex/cli.py

@@ -396,7 +396,7 @@ def cli(
         for directory in directories:
             for path in pathlib.Path(directory).rglob("*.py"):
                 # Skip if path is inside any of 'excludes'
-                if any(is_subpath(path, exclude) for exclude in excludes):
+                if any(path.resolve().is_relative_to(exclude) for exclude in excludes):
                     continue
                 if path.is_file():
                     yield path
@@ -538,11 +538,13 @@ def cli(
                 )
 
     if sum(output_formats) == 0:
+        seen_imports = set()
         for item in stuff_to_output():
             if item.output_identifier_line:
                 click.echo(item.output_identifier_line)
-            if item.output_import_line:
+            if item.output_import_line and item.output_import_line not in seen_imports:
                 click.echo(item.output_import_line)
+                seen_imports.add(item.output_import_line)
             click.echo(item.snippet)
             click.echo()
     else:
@@ -601,14 +603,6 @@ def cli(
         filepath.write_text(new, "utf-8")
 
 
-def is_subpath(path: pathlib.Path, parent: pathlib.Path) -> bool:
-    try:
-        path.relative_to(parent)
-        return True
-    except ValueError:
-        return False
-
-
 def is_dunder(name):
     return name.startswith("__") and name.endswith("__")
 

{symbex-1.4 → symbex-2.0}/symbex.egg-info/PKG-INFO

@@ -1,19 +1,26 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: symbex
-Version: 1.4
+Version: 2.0
 Summary: Find the Python code for specified symbols
-Home-page: https://github.com/simonw/symbex
 Author: Simon Willison
-License: Apache License, Version 2.0
+License-Expression: Apache-2.0
+Project-URL: Homepage, https://github.com/simonw/symbex
 Project-URL: Issues, https://github.com/simonw/symbex/issues
 Project-URL: CI, https://github.com/simonw/symbex/actions
 Project-URL: Changelog, https://github.com/simonw/symbex/releases
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Provides-Extra: test
 License-File: LICENSE
+Requires-Dist: click
+Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-icdiff; extra == "test"
+Requires-Dist: cogapp; extra == "test"
+Requires-Dist: PyYAML; extra == "test"
+Requires-Dist: ruff; extra == "test"
+Dynamic: license-file
 
-# symbex
+# Symbex
 
 [![PyPI](https://img.shields.io/pypi/v/symbex.svg)](https://pypi.org/project/symbex/)
 [![Changelog](https://img.shields.io/github/v/release/simonw/symbex?include_prereleases&label=changelog)](https://github.com/simonw/symbex/releases)
@@ -22,7 +29,7 @@ License-File: LICENSE
 
 Find the Python code for specified symbols
 
-Read [symbex: search Python code for functions and classes, then pipe them into a LLM](https://simonwillison.net/2023/Jun/18/symbex/) for background on this project.
+Read [Symbex: search Python code for functions and classes, then pipe them into a LLM](https://simonwillison.net/2023/Jun/18/symbex/) for background on this project.
 
 ## Installation
 

{symbex-1.4 → symbex-2.0}/symbex.egg-info/SOURCES.txt

@@ -1,6 +1,6 @@
 LICENSE
 README.md
-setup.py
+pyproject.toml
 symbex/__init__.py
 symbex/__main__.py
 symbex/cli.py

{symbex-1.4 → symbex-2.0}/tests/test_output.py

@@ -44,3 +44,30 @@ def test_output(extra_args, expected, expected_error):
     else:
         assert result.exit_code == 0
         assert result.output == expected
+
+
+def test_output_class_with_methods():
+    runner = CliRunner()
+    with runner.isolated_filesystem():
+        open("symbex.py", "w").write(
+            "class Foo:\n"
+            "    def bar(self):\n"
+            "        pass\n"
+            "    def baz(self):\n"
+            "        pass\n"
+        )
+        result = runner.invoke(
+            cli,
+            ["*", "*.*", "--docs", "--imports", "-n"],
+            catch_exceptions=False,
+        )
+    assert result.exit_code == 0
+    assert result.output == (
+        "# from symbex import Foo\n"
+        "class Foo:\n"
+        "\n"
+        "    def bar(self):\n"
+        "\n"
+        "    def baz(self):\n"
+        "\n"
+    )

{symbex-1.4 → symbex-2.0}/tests/test_symbex.py

@@ -89,6 +89,8 @@ def directory_full_of_code(tmpdir):
             ["baz", "-d", "nested.py", "-x", "nested.py/x/", "--silent"],
             "",
         ),
+        # -x to exclude top level directory
+        (["baz", "-x", "nested.py", "--silent"], ""),
         # Classes
         (
             ["MyClass", "--silent"],
@@ -164,10 +166,10 @@ def test_fixture(directory_full_of_code, monkeypatch, args, expected):
                 'def baz(delimiter=", ", type=str):'
             ),
         ),
-        # Test for the --module option
+        # Tests for the --module option
         (
-            ["-m", "pathlib", "Path", "--silent", "-in"],
-            ("# from pathlib import Path\nclass Path(PurePath):"),
+            ["-m", "contextlib", "suppress", "--silent", "-sn"],
+            ("class suppress(AbstractContextManager):"),
         ),
     ),
 )

symbex-1.4/setup.py

@@ -1,37 +0,0 @@
-from setuptools import setup
-import os
-
-VERSION = "1.4"
-
-
-def get_long_description():
-    with open(
-        os.path.join(os.path.dirname(os.path.abspath(__file__)), "README.md"),
-        encoding="utf8",
-    ) as fp:
-        return fp.read()
-
-
-setup(
-    name="symbex",
-    description="Find the Python code for specified symbols",
-    long_description=get_long_description(),
-    long_description_content_type="text/markdown",
-    author="Simon Willison",
-    url="https://github.com/simonw/symbex",
-    project_urls={
-        "Issues": "https://github.com/simonw/symbex/issues",
-        "CI": "https://github.com/simonw/symbex/actions",
-        "Changelog": "https://github.com/simonw/symbex/releases",
-    },
-    license="Apache License, Version 2.0",
-    version=VERSION,
-    packages=["symbex"],
-    entry_points="""
-        [console_scripts]
-        symbex=symbex.cli:cli
-    """,
-    install_requires=["click"],
-    extras_require={"test": ["pytest", "pytest-icdiff", "cogapp", "PyYAML", "ruff"]},
-    python_requires=">=3.8",
-)