From 6424ca9bcd2ccf95bdae9c9804dfebe4aee41ebd Mon Sep 17 00:00:00 2001 From: hminaee-tc Date: Tue, 23 Sep 2025 21:00:21 -0300 Subject: [PATCH 1/2] fix: remove redundant folder and bring up one level up --- .github/workflows/tests.yaml | 6 +++--- cpk_lib_python_github/__init__.py | 8 ++++---- .../github_app_token_generator/__init__.py | 0 .../github_app_token_generator/__main__.py | 0 .../github_app_token_generator/auth.py | 0 .../github_app_token_generator/cli.py | 0 .../github_app_token_generator/config.py | 0 .../github_app_token_generator/formatters.py | 0 .../github_app_token_generator/github_api.py | 0 .../github_app_token_generator/main.py | 0 .../github_app_token_generator/token_manager.py | 0 .../github_app_token_generator_package/__init__.py | 6 ------ .../tests/__init__.py | 0 .../tests/conftest.py | 0 .../tests/test_github_api.py | 0 15 files changed, 7 insertions(+), 13 deletions(-) rename cpk_lib_python_github/{github_app_token_generator_package => }/github_app_token_generator/__init__.py (100%) rename cpk_lib_python_github/{github_app_token_generator_package => }/github_app_token_generator/__main__.py (100%) rename cpk_lib_python_github/{github_app_token_generator_package => }/github_app_token_generator/auth.py (100%) rename cpk_lib_python_github/{github_app_token_generator_package => }/github_app_token_generator/cli.py (100%) rename cpk_lib_python_github/{github_app_token_generator_package => }/github_app_token_generator/config.py (100%) rename cpk_lib_python_github/{github_app_token_generator_package => }/github_app_token_generator/formatters.py (100%) rename cpk_lib_python_github/{github_app_token_generator_package => }/github_app_token_generator/github_api.py (100%) rename cpk_lib_python_github/{github_app_token_generator_package => }/github_app_token_generator/main.py (100%) rename cpk_lib_python_github/{github_app_token_generator_package => }/github_app_token_generator/token_manager.py (100%) delete mode 100644 cpk_lib_python_github/github_app_token_generator_package/__init__.py rename cpk_lib_python_github/{github_app_token_generator_package => }/tests/__init__.py (100%) rename cpk_lib_python_github/{github_app_token_generator_package => }/tests/conftest.py (100%) rename cpk_lib_python_github/{github_app_token_generator_package => }/tests/test_github_api.py (100%) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 5f5efa9..5eeffca 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -28,12 +28,12 @@ jobs: - name: Run tests run: | - pytest cpk_lib_python_github/github_app_token_generator_package/tests/ -v + pytest cpk_lib_python_github/tests/ -v - name: Run tests with coverage run: | - pytest cpk_lib_python_github/github_app_token_generator_package/tests/ \ - --cov=cpk_lib_python_github.github_app_token_generator_package.github_app_token_generator \ + pytest cpk_lib_python_github/tests/ \ + --cov=cpk_lib_python_github.github_app_token_generator \ --cov-report=term-missing test-installation: diff --git a/cpk_lib_python_github/__init__.py b/cpk_lib_python_github/__init__.py index 301f7d0..92d21db 100644 --- a/cpk_lib_python_github/__init__.py +++ b/cpk_lib_python_github/__init__.py @@ -1,16 +1,16 @@ # -*- coding: utf-8 -*- """CPK Lib Python GitHub - GitHub App Token Generator Package.""" -from .github_app_token_generator_package.github_app_token_generator import ( +from .github_app_token_generator import ( token_manager, ) -from .github_app_token_generator_package.github_app_token_generator.config import ( +from .github_app_token_generator.config import ( Config, ) -from .github_app_token_generator_package.github_app_token_generator.formatters import ( +from .github_app_token_generator.formatters import ( OutputFormatter, ) -from .github_app_token_generator_package.github_app_token_generator.github_api import ( +from .github_app_token_generator.github_api import ( GitHubAPIClient, ) diff --git a/cpk_lib_python_github/github_app_token_generator_package/github_app_token_generator/__init__.py b/cpk_lib_python_github/github_app_token_generator/__init__.py similarity index 100% rename from cpk_lib_python_github/github_app_token_generator_package/github_app_token_generator/__init__.py rename to cpk_lib_python_github/github_app_token_generator/__init__.py diff --git a/cpk_lib_python_github/github_app_token_generator_package/github_app_token_generator/__main__.py b/cpk_lib_python_github/github_app_token_generator/__main__.py similarity index 100% rename from cpk_lib_python_github/github_app_token_generator_package/github_app_token_generator/__main__.py rename to cpk_lib_python_github/github_app_token_generator/__main__.py diff --git a/cpk_lib_python_github/github_app_token_generator_package/github_app_token_generator/auth.py b/cpk_lib_python_github/github_app_token_generator/auth.py similarity index 100% rename from cpk_lib_python_github/github_app_token_generator_package/github_app_token_generator/auth.py rename to cpk_lib_python_github/github_app_token_generator/auth.py diff --git a/cpk_lib_python_github/github_app_token_generator_package/github_app_token_generator/cli.py b/cpk_lib_python_github/github_app_token_generator/cli.py similarity index 100% rename from cpk_lib_python_github/github_app_token_generator_package/github_app_token_generator/cli.py rename to cpk_lib_python_github/github_app_token_generator/cli.py diff --git a/cpk_lib_python_github/github_app_token_generator_package/github_app_token_generator/config.py b/cpk_lib_python_github/github_app_token_generator/config.py similarity index 100% rename from cpk_lib_python_github/github_app_token_generator_package/github_app_token_generator/config.py rename to cpk_lib_python_github/github_app_token_generator/config.py diff --git a/cpk_lib_python_github/github_app_token_generator_package/github_app_token_generator/formatters.py b/cpk_lib_python_github/github_app_token_generator/formatters.py similarity index 100% rename from cpk_lib_python_github/github_app_token_generator_package/github_app_token_generator/formatters.py rename to cpk_lib_python_github/github_app_token_generator/formatters.py diff --git a/cpk_lib_python_github/github_app_token_generator_package/github_app_token_generator/github_api.py b/cpk_lib_python_github/github_app_token_generator/github_api.py similarity index 100% rename from cpk_lib_python_github/github_app_token_generator_package/github_app_token_generator/github_api.py rename to cpk_lib_python_github/github_app_token_generator/github_api.py diff --git a/cpk_lib_python_github/github_app_token_generator_package/github_app_token_generator/main.py b/cpk_lib_python_github/github_app_token_generator/main.py similarity index 100% rename from cpk_lib_python_github/github_app_token_generator_package/github_app_token_generator/main.py rename to cpk_lib_python_github/github_app_token_generator/main.py diff --git a/cpk_lib_python_github/github_app_token_generator_package/github_app_token_generator/token_manager.py b/cpk_lib_python_github/github_app_token_generator/token_manager.py similarity index 100% rename from cpk_lib_python_github/github_app_token_generator_package/github_app_token_generator/token_manager.py rename to cpk_lib_python_github/github_app_token_generator/token_manager.py diff --git a/cpk_lib_python_github/github_app_token_generator_package/__init__.py b/cpk_lib_python_github/github_app_token_generator_package/__init__.py deleted file mode 100644 index 2cb0132..0000000 --- a/cpk_lib_python_github/github_app_token_generator_package/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# -*- coding: utf-8 -*- -"""GitHub App Token Generator Package.""" - -from .github_app_token_generator import * - -__all__ = ["github_app_token_generator"] diff --git a/cpk_lib_python_github/github_app_token_generator_package/tests/__init__.py b/cpk_lib_python_github/tests/__init__.py similarity index 100% rename from cpk_lib_python_github/github_app_token_generator_package/tests/__init__.py rename to cpk_lib_python_github/tests/__init__.py diff --git a/cpk_lib_python_github/github_app_token_generator_package/tests/conftest.py b/cpk_lib_python_github/tests/conftest.py similarity index 100% rename from cpk_lib_python_github/github_app_token_generator_package/tests/conftest.py rename to cpk_lib_python_github/tests/conftest.py diff --git a/cpk_lib_python_github/github_app_token_generator_package/tests/test_github_api.py b/cpk_lib_python_github/tests/test_github_api.py similarity index 100% rename from cpk_lib_python_github/github_app_token_generator_package/tests/test_github_api.py rename to cpk_lib_python_github/tests/test_github_api.py From 6093ab6ee75b1ed9eb3fa12b7693587e19eab42b Mon Sep 17 00:00:00 2001 From: hminaee-tc Date: Tue, 23 Sep 2025 21:04:00 -0300 Subject: [PATCH 2/2] fix: remove redundant folder and bring up one level up --- pyproject.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 3368b24..e96e808 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -55,7 +55,7 @@ Issues = "https://github.com/cpk/cpk-lib-python-github/issues" Documentation = "https://github.com/cpk/cpk-lib-python-github#readme" [project.entry-points."console_scripts"] -github-app-token-generator = "cpk_lib_python_github.github_app_token_generator_package.github_app_token_generator.main:main" +github-app-token-generator = "cpk_lib_python_github.github_app_token_generator.main:main" [project.optional-dependencies] dep = [ @@ -78,7 +78,7 @@ dev = [ [tool.pytest.ini_options] testpaths = [ - "cpk_lib_python_github/github_app_token_generator_package/tests" + "cpk_lib_python_github/tests" ] python_files = ["test_*.py"] python_classes = ["Test*"] @@ -87,7 +87,7 @@ addopts = [ "--strict-markers", "--strict-config", "--verbose", - "--cov=cpk_lib_python_github.github_app_token_generator_package.github_app_token_generator", + "--cov=cpk_lib_python_github.github_app_token_generator", "--cov-report=term-missing", "--cov-report=html" ]