From b06a6a802ad906d085b42744ffb0bb8c1215f54f Mon Sep 17 00:00:00 2001 From: Rahul Krishna Date: Thu, 10 Jul 2025 17:57:59 -0700 Subject: [PATCH] Update folder structure and hatch builds to fix issue #2 Signed-off-by: Rahul Krishna --- {src/codeanalyzer => codeanalyzer}/__init__.py | 0 {src/codeanalyzer => codeanalyzer}/__main__.py | 0 {src/codeanalyzer => codeanalyzer}/core.py | 0 .../jedi/__init__.py | 0 {src/codeanalyzer => codeanalyzer}/jedi/jedi.py | 0 {src/codeanalyzer => codeanalyzer}/py.typed | 0 .../schema/__init__.py | 0 .../schema/py_schema.py | 0 .../semantic_analysis/__init__.py | 0 .../semantic_analysis/codeql/__init__.py | 0 .../semantic_analysis/codeql/codeql_analysis.py | 0 .../codeql/codeql_exceptions.py | 0 .../semantic_analysis/codeql/codeql_loader.py | 0 .../codeql/codeql_query_runner.py | 0 .../semantic_analysis/wala/__init__.py | 0 .../syntactic_analysis/__init__.py | 0 .../syntactic_analysis/symbol_table_builder.py | 0 .../utils/__init__.py | 0 .../utils/logging.py | 0 .../utils/progress_bar.py | 0 pyproject.toml | 16 ++++++---------- {src/test => test}/.gitignore | 0 {src/test => test}/conftest.py | 0 {src/test => test}/test_cli.py | 0 uv.lock | 4 ++-- 25 files changed, 8 insertions(+), 12 deletions(-) rename {src/codeanalyzer => codeanalyzer}/__init__.py (100%) rename {src/codeanalyzer => codeanalyzer}/__main__.py (100%) rename {src/codeanalyzer => codeanalyzer}/core.py (100%) rename {src/codeanalyzer => codeanalyzer}/jedi/__init__.py (100%) rename {src/codeanalyzer => codeanalyzer}/jedi/jedi.py (100%) rename {src/codeanalyzer => codeanalyzer}/py.typed (100%) rename {src/codeanalyzer => codeanalyzer}/schema/__init__.py (100%) rename {src/codeanalyzer => codeanalyzer}/schema/py_schema.py (100%) rename {src/codeanalyzer => codeanalyzer}/semantic_analysis/__init__.py (100%) rename {src/codeanalyzer => codeanalyzer}/semantic_analysis/codeql/__init__.py (100%) rename {src/codeanalyzer => codeanalyzer}/semantic_analysis/codeql/codeql_analysis.py (100%) rename {src/codeanalyzer => codeanalyzer}/semantic_analysis/codeql/codeql_exceptions.py (100%) rename {src/codeanalyzer => codeanalyzer}/semantic_analysis/codeql/codeql_loader.py (100%) rename {src/codeanalyzer => codeanalyzer}/semantic_analysis/codeql/codeql_query_runner.py (100%) rename {src/codeanalyzer => codeanalyzer}/semantic_analysis/wala/__init__.py (100%) rename {src/codeanalyzer => codeanalyzer}/syntactic_analysis/__init__.py (100%) rename {src/codeanalyzer => codeanalyzer}/syntactic_analysis/symbol_table_builder.py (100%) rename {src/codeanalyzer => codeanalyzer}/utils/__init__.py (100%) rename {src/codeanalyzer => codeanalyzer}/utils/logging.py (100%) rename {src/codeanalyzer => codeanalyzer}/utils/progress_bar.py (100%) rename {src/test => test}/.gitignore (100%) rename {src/test => test}/conftest.py (100%) rename {src/test => test}/test_cli.py (100%) diff --git a/src/codeanalyzer/__init__.py b/codeanalyzer/__init__.py similarity index 100% rename from src/codeanalyzer/__init__.py rename to codeanalyzer/__init__.py diff --git a/src/codeanalyzer/__main__.py b/codeanalyzer/__main__.py similarity index 100% rename from src/codeanalyzer/__main__.py rename to codeanalyzer/__main__.py diff --git a/src/codeanalyzer/core.py b/codeanalyzer/core.py similarity index 100% rename from src/codeanalyzer/core.py rename to codeanalyzer/core.py diff --git a/src/codeanalyzer/jedi/__init__.py b/codeanalyzer/jedi/__init__.py similarity index 100% rename from src/codeanalyzer/jedi/__init__.py rename to codeanalyzer/jedi/__init__.py diff --git a/src/codeanalyzer/jedi/jedi.py b/codeanalyzer/jedi/jedi.py similarity index 100% rename from src/codeanalyzer/jedi/jedi.py rename to codeanalyzer/jedi/jedi.py diff --git a/src/codeanalyzer/py.typed b/codeanalyzer/py.typed similarity index 100% rename from src/codeanalyzer/py.typed rename to codeanalyzer/py.typed diff --git a/src/codeanalyzer/schema/__init__.py b/codeanalyzer/schema/__init__.py similarity index 100% rename from src/codeanalyzer/schema/__init__.py rename to codeanalyzer/schema/__init__.py diff --git a/src/codeanalyzer/schema/py_schema.py b/codeanalyzer/schema/py_schema.py similarity index 100% rename from src/codeanalyzer/schema/py_schema.py rename to codeanalyzer/schema/py_schema.py diff --git a/src/codeanalyzer/semantic_analysis/__init__.py b/codeanalyzer/semantic_analysis/__init__.py similarity index 100% rename from src/codeanalyzer/semantic_analysis/__init__.py rename to codeanalyzer/semantic_analysis/__init__.py diff --git a/src/codeanalyzer/semantic_analysis/codeql/__init__.py b/codeanalyzer/semantic_analysis/codeql/__init__.py similarity index 100% rename from src/codeanalyzer/semantic_analysis/codeql/__init__.py rename to codeanalyzer/semantic_analysis/codeql/__init__.py diff --git a/src/codeanalyzer/semantic_analysis/codeql/codeql_analysis.py b/codeanalyzer/semantic_analysis/codeql/codeql_analysis.py similarity index 100% rename from src/codeanalyzer/semantic_analysis/codeql/codeql_analysis.py rename to codeanalyzer/semantic_analysis/codeql/codeql_analysis.py diff --git a/src/codeanalyzer/semantic_analysis/codeql/codeql_exceptions.py b/codeanalyzer/semantic_analysis/codeql/codeql_exceptions.py similarity index 100% rename from src/codeanalyzer/semantic_analysis/codeql/codeql_exceptions.py rename to codeanalyzer/semantic_analysis/codeql/codeql_exceptions.py diff --git a/src/codeanalyzer/semantic_analysis/codeql/codeql_loader.py b/codeanalyzer/semantic_analysis/codeql/codeql_loader.py similarity index 100% rename from src/codeanalyzer/semantic_analysis/codeql/codeql_loader.py rename to codeanalyzer/semantic_analysis/codeql/codeql_loader.py diff --git a/src/codeanalyzer/semantic_analysis/codeql/codeql_query_runner.py b/codeanalyzer/semantic_analysis/codeql/codeql_query_runner.py similarity index 100% rename from src/codeanalyzer/semantic_analysis/codeql/codeql_query_runner.py rename to codeanalyzer/semantic_analysis/codeql/codeql_query_runner.py diff --git a/src/codeanalyzer/semantic_analysis/wala/__init__.py b/codeanalyzer/semantic_analysis/wala/__init__.py similarity index 100% rename from src/codeanalyzer/semantic_analysis/wala/__init__.py rename to codeanalyzer/semantic_analysis/wala/__init__.py diff --git a/src/codeanalyzer/syntactic_analysis/__init__.py b/codeanalyzer/syntactic_analysis/__init__.py similarity index 100% rename from src/codeanalyzer/syntactic_analysis/__init__.py rename to codeanalyzer/syntactic_analysis/__init__.py diff --git a/src/codeanalyzer/syntactic_analysis/symbol_table_builder.py b/codeanalyzer/syntactic_analysis/symbol_table_builder.py similarity index 100% rename from src/codeanalyzer/syntactic_analysis/symbol_table_builder.py rename to codeanalyzer/syntactic_analysis/symbol_table_builder.py diff --git a/src/codeanalyzer/utils/__init__.py b/codeanalyzer/utils/__init__.py similarity index 100% rename from src/codeanalyzer/utils/__init__.py rename to codeanalyzer/utils/__init__.py diff --git a/src/codeanalyzer/utils/logging.py b/codeanalyzer/utils/logging.py similarity index 100% rename from src/codeanalyzer/utils/logging.py rename to codeanalyzer/utils/logging.py diff --git a/src/codeanalyzer/utils/progress_bar.py b/codeanalyzer/utils/progress_bar.py similarity index 100% rename from src/codeanalyzer/utils/progress_bar.py rename to codeanalyzer/utils/progress_bar.py diff --git a/pyproject.toml b/pyproject.toml index 4bc3831..1ab5fc6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "codeanalyzer-python" -version = "0.1.1" +version = "0.1.2" description = "Static Analysis on Python source code using Jedi, CodeQL and Treesitter." readme = "README.md" authors = [ @@ -41,22 +41,18 @@ codeanalyzer = "codeanalyzer.__main__:app" requires = ["hatchling"] build-backend = "hatchling.build" -[tool.hatch.build] -# Tell hatchling to use the src layout -sources = ["src"] - [tool.hatch.build.targets.wheel] -packages = ["src/codeanalyzer"] -include = ["src/codeanalyzer/py.typed"] +packages = ["codeanalyzer"] +include = ["codeanalyzer/py.typed"] [tool.hatch.build.targets.sdist] include = [ - "src/codeanalyzer", - "src/codeanalyzer/py.typed", + "codeanalyzer", + "codeanalyzer/py.typed", "README.md", "LICENSE", "NOTICE" ] [tool.pytest.ini_options] -testpaths = ["src/test"] +testpaths = ["tests"] diff --git a/src/test/.gitignore b/test/.gitignore similarity index 100% rename from src/test/.gitignore rename to test/.gitignore diff --git a/src/test/conftest.py b/test/conftest.py similarity index 100% rename from src/test/conftest.py rename to test/conftest.py diff --git a/src/test/test_cli.py b/test/test_cli.py similarity index 100% rename from src/test/test_cli.py rename to test/test_cli.py diff --git a/uv.lock b/uv.lock index 87a6c0c..971fde7 100644 --- a/uv.lock +++ b/uv.lock @@ -250,8 +250,8 @@ wheels = [ ] [[package]] -name = "codeanalyzer" -version = "0.1.1" +name = "codeanalyzer-python" +version = "0.1.2" source = { editable = "." } dependencies = [ { name = "asteroid" },