Skip to content

Commit 8a73b67

Browse files
Move gscli into codegen.gscli (#42)
# Motivation <!-- Why is this change necessary? --> # Content <!-- Please include a summary of the change --> # Testing <!-- How was the change tested? --> # Please check the following before marking your PR as ready for review - [ ] I have added tests for my changes - [ ] I have updated the documentation or added new documentation as needed - [ ] I have read and agree to the [Contributor License Agreement](../CLA.md) Co-authored-by: Edward Li <[email protected]>
1 parent 4b89042 commit 8a73b67

File tree

18 files changed

+12
-10
lines changed

18 files changed

+12
-10
lines changed

docs/conftest.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
from codegen.sdk.enums import ProgrammingLanguage
1212
from codegen.sdk.typescript.class_definition import TSClass
1313
from codegen.sdk.typescript.file import TSFile
14-
from gscli.generate.runner_imports import EXTERNAL_IMPORTS
14+
from codegen.gscli.generate.runner_imports import EXTERNAL_IMPORTS
15+
1516
SAMPLE_FILENAME = {
1617
ProgrammingLanguage.PYTHON: "sample.py",
1718
ProgrammingLanguage.TYPESCRIPT: "sample.tsx",
@@ -20,6 +21,7 @@
2021
language: Path(__file__).parent / "samples" / name for language, name in SAMPLE_FILENAME.items()}
2122
SAMPLE_INPUT = {language: path.read_text() for language, path in SAMPLE_INPUT_PATH.items()}
2223
DEFAULT_LANGUAGE = ProgrammingLanguage.TYPESCRIPT
24+
2325
@pytest.fixture(scope="function")
2426
def codebase(tmpdir):
2527
with get_codebase_session(tmpdir, programming_language=DEFAULT_LANGUAGE, files={SAMPLE_FILENAME[DEFAULT_LANGUAGE]: SAMPLE_INPUT[DEFAULT_LANGUAGE]}) as codebase:

hatch.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ macos-max-compat = false
7272
[build]
7373
packages = [
7474
"src/codegen/sdk",
75+
"src/codegen/gscli",
7576
"src/graph_visualization",
76-
"src/gscli",
7777
]
7878

7979
[metadata.hooks.vcs]

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ classifiers = [
6262
"Intended Audience :: Developers", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", "Topic :: Software Development", "Development Status :: 4 - Beta", "Environment :: MacOS X", "Programming Language :: Python :: 3", "Programming Language :: Python", ]
6363

6464
[project.scripts]
65-
gs = "gscli.main:main"
65+
gs = "codegen.gscli.main:main"
6666
run_string = "codegen.sdk.core.main:main"
6767
[project.optional-dependencies]
6868
types = [
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/gscli/generate/commands.py renamed to src/codegen/gscli/generate/commands.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
import inflection
99
from termcolor import colored
1010

11+
from codegen.gscli.generate.runner_imports import _generate_runner_imports
12+
from codegen.gscli.generate.utils import LanguageType, generate_builtins_file
1113
from codegen.sdk.code_generation.doc_utils.canonicals import get_canonical_codemod_class_mdx, get_canonical_codemod_classes
1214
from codegen.sdk.code_generation.doc_utils.skills import format_all_skills
1315
from codegen.sdk.code_generation.doc_utils.utils import get_all_classes_to_document
@@ -17,8 +19,6 @@
1719
from codegen.sdk.enums import ProgrammingLanguage
1820
from codegen.sdk.python import PyClass
1921
from codegen.sdk.skills.core.utils import get_all_skills, get_guide_skills_dict
20-
from gscli.generate.runner_imports import _generate_runner_imports
21-
from gscli.generate.utils import LanguageType, generate_builtins_file
2222

2323
logger = logging.getLogger(__name__)
2424

File renamed without changes.

src/gscli/main.py renamed to src/codegen/gscli/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
import click
55

6-
from gscli.codemod.commands import codemod
7-
from gscli.generate.commands import generate
6+
from codegen.gscli.codemod.commands import codemod
7+
from codegen.gscli.generate.commands import generate
88

99

1010
@click.group()
File renamed without changes.

src/codegen/sdk/testing/test_discovery.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
import emoji
1111
from loguru import logger
1212

13+
from codegen.gscli.generate.runner_imports import get_runner_imports
1314
from codegen.sdk.codemod import Codemod3
1415
from codegen.sdk.enums import ProgrammingLanguage
1516
from codegen.sdk.testing.constants import DIFF_FILEPATH
1617
from codegen.sdk.testing.models import BASE_PATH, CODEMOD_PATH, REPO_ID_TO_URL, TEST_DIR, VERIFIED_CODEMOD_DATA_DIR, VERIFIED_CODEMOD_DIFFS, ClonedRepoTestCase, CodemodMetadata, Repo, Size
1718
from codegen.sdk.testing.verified_codemod_utils import CodemodAPI, RepoCodemodMetadata, SkillTestConfig, anonymize_id
18-
from gscli.generate.runner_imports import get_runner_imports
1919

2020
if TYPE_CHECKING:
2121
pass

src/graph_sitter_build/build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
def update_init_file(file: Path) -> None:
99
path = Path(__file__).parent.parent
1010
sys.path.append(str(path))
11-
from gscli.generate.runner_imports import generate_exported_modules, get_runner_imports
11+
from codegen.gscli.generate.runner_imports import generate_exported_modules, get_runner_imports
1212

1313
content = file.read_text()
1414
content = get_runner_imports(include_codegen=False) + "\n" + content + "\n" + generate_exported_modules()

tests/unit/test_cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
def test_cli():
2-
import gscli # noqa: F401
2+
import codegen.gscli # noqa: F401

0 commit comments

Comments
 (0)