Merge branch 'develop' into jayhack-cg-10396-merge-cli-into-gs-repo

Author: jayhack

.circleci/config.yml

@@ -96,9 +96,6 @@ commands:
     - run:
         command: |
           uv run --frozen cibuildwheel --output-dir dist
-          if [[ "<<parameters.base_packages>>" == "true" ]]; then
-            uv build --package codegen-git --wheel --sdist
-          fi
           rm dist/.gitignore || true
         environment:
           HATCH_BUILD_HOOKS_ENABLE: "true"

.github/codecov.yml

@@ -29,11 +29,6 @@ component_management:
       name: codegen-sdk-core
       paths:
         - src/codegen/sdk/**
-    - component_id: codegen-git
-      name: codegen-git
-      paths:
-        - codegen-git/**
-
 
 flag_management:
   default_rules:

.github/workflows/release.yml

@@ -32,7 +32,6 @@ jobs:
       - name: Build release distributions
         run: |
           uv build --wheel
-          uv build --package codegen-git --wheel
         env:
           HATCH_BUILD_HOOKS_ENABLE: true
       - name: Upload distributions

.pre-commit-config.yaml

@@ -69,7 +69,7 @@ repos:
       - id: deptry
         pass_filenames: false
         always_run: true
-        entry: bash -c "uv run --frozen --all-extras --dev deptry src codegen-git/src --ignore DEP001"
+        entry: bash -c "uv run --frozen --all-extras --dev deptry src --ignore DEP001"
   - repo: "local"
     hooks:
       - id: disallowed-words-check

codegen-git/README.md

@@ -32,7 +32,6 @@ dependencies = [
     "docstring-parser<1.0,>=0.16",
     "plotly<6.0.0,>=5.24.0",
     "humanize<5.0.0,>=4.10.0",
-    "codegen-git",
     "autoflake>=2.3.1",
     "black>=24.8.0",
     "pytest-snapshot>=0.9.0",
@@ -61,6 +60,8 @@ dependencies = [
     "unidiff>=0.7.5",
     "datamodel-code-generator>=0.26.5",
     "toml>=0.10.2",
+    "PyGithub==2.5.0",
+    "GitPython==3.1.44",
 ]
 license = {file = "LICENSE"}
 classifiers = [
@@ -108,7 +109,7 @@ keyring-provider = "subprocess"
 #extra-index-url = ["https://[email protected]/pypi/codegen/simple/"]
 publish-url = "https://codegen-922078275900.d.codeartifact.us-east-1.amazonaws.com/pypi/codegen/"
 [tool.uv.workspace]
-members = ["codegen-git"]
+members = []
 
 [tool.cython-lint]
 max-line-length = 200
@@ -154,7 +155,7 @@ lint.exclude = [
 ] # disable just linting for notebooks (allow for formatting)
 lint.pydocstyle.convention = "google"
 [tool.ruff.lint.isort]
-known-first-party = ["app", "codegen_git"]
+known-first-party = ["app"]
 known-third-party = ["git"]
 #known-local-folder=[]
 [tool.coverage.run]
@@ -207,9 +208,6 @@ junit_logging = "all"
 requires = ["hatchling>=1.26.3", "hatch-vcs>=0.4.0", "setuptools-scm>=8.0.0"]
 build-backend = "hatchling.build"
 
-[tool.uv.sources]
-codegen-git = { workspace = true }
-
 [tool.deptry]
 extend_exclude = [".*/eval/test_files/.*.py", ".*conftest.py"]
 pep621_dev_dependency_groups = ["types"]
@@ -220,6 +218,7 @@ DEP004 = "pytest"
 
 [tool.deptry.package_module_name_map]
 python-levenshtein = ["Levenshtein"]
+PyGithub = ["github"]
 [tool.cibuildwheel]
 build-frontend = "build[uv]"
 skip = ["*-musllinux_i686", "*-manylinux_i686", "*-musllinux_x86_64"]

codegen-git/pyproject.toml

@@ -6,7 +6,7 @@
 from github.Installation import Installation
 from github.InstallationAuthorization import InstallationAuthorization
 
-from codegen_git.schemas.github import GithubType
+from codegen.git.schemas.github import GithubType
 
 logger = logging.getLogger(__name__)
 

codegen-git/src/codegen_git/clients/types.py

@@ -14,11 +14,11 @@
 from github.Tag import Tag
 from github.Workflow import Workflow
 
-from codegen_git.clients.github_client_factory import GithubClientFactory
-from codegen_git.clients.types import GithubClientType
-from codegen_git.schemas.github import GithubScope, GithubType
-from codegen_git.schemas.repo_config import RepoConfig
-from codegen_git.utils.format import format_comparison
+from codegen.git.clients.github_client_factory import GithubClientFactory
+from codegen.git.clients.types import GithubClientType
+from codegen.git.schemas.github import GithubScope, GithubType
+from codegen.git.schemas.repo_config import RepoConfig
+from codegen.git.utils.format import format_comparison
 
 logger = logging.getLogger(__name__)