From 46cdfb998bbd27b5c5e584a6591fa6141c7d2d9f Mon Sep 17 00:00:00 2001 From: Grigory Statsenko Date: Thu, 12 Oct 2023 18:17:46 +0200 Subject: [PATCH] Added dl_gitmanager package for custom diff resolution --- dl-repo.yml | 3 - lib/dl_package_boilerplate/pyproject.toml | 2 - terrarium/dl_cli_tools/LICENSE | 201 ++++++++++++++++++ terrarium/dl_cli_tools/README.md | 4 + .../dl_cli_tools/dl_cli_tools/__init__.py | 0 .../dl_cli_tools}/cli_base.py | 0 .../dl_cli_tools}/logging.py | 0 terrarium/dl_cli_tools/dl_cli_tools/py.typed | 0 .../dl_cli_tools/testing/__init__.py | 0 .../dl_cli_tools/testing/tool_runner.py | 27 +++ .../dl_cli_tools_tests/__init__.py | 0 .../dl_cli_tools_tests/unit/__init__.py | 0 .../dl_cli_tools_tests/unit/conftest.py | 0 terrarium/dl_cli_tools/pyproject.toml | 39 ++++ terrarium/dl_gitmanager/LICENSE | 201 ++++++++++++++++++ terrarium/dl_gitmanager/README.md | 4 + .../dl_gitmanager/dl_gitmanager/__init__.py | 0 .../dl_gitmanager/git_manager.py | 70 ++++++ .../dl_gitmanager/dl_gitmanager/py.typed | 0 .../dl_gitmanager/scripts/__init__.py | 0 .../dl_gitmanager/scripts/gitmanager_cli.py | 74 +++++++ .../dl_gitmanager_tests/__init__.py | 0 .../dl_gitmanager_tests/unit/__init__.py | 0 .../dl_gitmanager_tests/unit/conftest.py | 0 terrarium/dl_gitmanager/pyproject.toml | 41 ++++ .../dl_repmanager/scripts/package_meta_cli.py | 4 +- .../dl_repmanager/scripts/repmanager_cli.py | 4 +- .../scripts/scoped_metapkg_sync.py | 2 +- .../dl_repmanager_tests/unit/tool_runner.py | 28 +-- terrarium/dl_repmanager/pyproject.toml | 1 + 30 files changed, 671 insertions(+), 34 deletions(-) create mode 100644 terrarium/dl_cli_tools/LICENSE create mode 100644 terrarium/dl_cli_tools/README.md create mode 100644 terrarium/dl_cli_tools/dl_cli_tools/__init__.py rename terrarium/{dl_repmanager/dl_repmanager/scripts => dl_cli_tools/dl_cli_tools}/cli_base.py (100%) rename terrarium/{dl_repmanager/dl_repmanager => dl_cli_tools/dl_cli_tools}/logging.py (100%) create mode 100644 terrarium/dl_cli_tools/dl_cli_tools/py.typed create mode 100644 terrarium/dl_cli_tools/dl_cli_tools/testing/__init__.py create mode 100644 terrarium/dl_cli_tools/dl_cli_tools/testing/tool_runner.py create mode 100644 terrarium/dl_cli_tools/dl_cli_tools_tests/__init__.py create mode 100644 terrarium/dl_cli_tools/dl_cli_tools_tests/unit/__init__.py create mode 100644 terrarium/dl_cli_tools/dl_cli_tools_tests/unit/conftest.py create mode 100644 terrarium/dl_cli_tools/pyproject.toml create mode 100644 terrarium/dl_gitmanager/LICENSE create mode 100644 terrarium/dl_gitmanager/README.md create mode 100644 terrarium/dl_gitmanager/dl_gitmanager/__init__.py create mode 100644 terrarium/dl_gitmanager/dl_gitmanager/git_manager.py create mode 100644 terrarium/dl_gitmanager/dl_gitmanager/py.typed create mode 100644 terrarium/dl_gitmanager/dl_gitmanager/scripts/__init__.py create mode 100644 terrarium/dl_gitmanager/dl_gitmanager/scripts/gitmanager_cli.py create mode 100644 terrarium/dl_gitmanager/dl_gitmanager_tests/__init__.py create mode 100644 terrarium/dl_gitmanager/dl_gitmanager_tests/unit/__init__.py create mode 100644 terrarium/dl_gitmanager/dl_gitmanager_tests/unit/conftest.py create mode 100644 terrarium/dl_gitmanager/pyproject.toml diff --git a/dl-repo.yml b/dl-repo.yml index 12f6abbd5..747955cdd 100644 --- a/dl-repo.yml +++ b/dl-repo.yml @@ -5,9 +5,6 @@ dl_repo: default_boilerplate_path: lib/dl_package_boilerplate - default_registration_metapackages: - - main_mpkg - package_types: - type: terrarium # Repository tools root_path: terrarium diff --git a/lib/dl_package_boilerplate/pyproject.toml b/lib/dl_package_boilerplate/pyproject.toml index 0b3687d62..ada826d5a 100644 --- a/lib/dl_package_boilerplate/pyproject.toml +++ b/lib/dl_package_boilerplate/pyproject.toml @@ -27,8 +27,6 @@ minversion = "6.0" addopts = "-ra" testpaths = [] - - [datalens_ci] skip_test = true diff --git a/terrarium/dl_cli_tools/LICENSE b/terrarium/dl_cli_tools/LICENSE new file mode 100644 index 000000000..74ba5f6c7 --- /dev/null +++ b/terrarium/dl_cli_tools/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2023 YANDEX LLC + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/terrarium/dl_cli_tools/README.md b/terrarium/dl_cli_tools/README.md new file mode 100644 index 000000000..659e6bd2c --- /dev/null +++ b/terrarium/dl_cli_tools/README.md @@ -0,0 +1,4 @@ +# dl_cli_tools + +A dummy package used for initialization of new library packages +either manually or via `dl_repmanager` diff --git a/terrarium/dl_cli_tools/dl_cli_tools/__init__.py b/terrarium/dl_cli_tools/dl_cli_tools/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/terrarium/dl_repmanager/dl_repmanager/scripts/cli_base.py b/terrarium/dl_cli_tools/dl_cli_tools/cli_base.py similarity index 100% rename from terrarium/dl_repmanager/dl_repmanager/scripts/cli_base.py rename to terrarium/dl_cli_tools/dl_cli_tools/cli_base.py diff --git a/terrarium/dl_repmanager/dl_repmanager/logging.py b/terrarium/dl_cli_tools/dl_cli_tools/logging.py similarity index 100% rename from terrarium/dl_repmanager/dl_repmanager/logging.py rename to terrarium/dl_cli_tools/dl_cli_tools/logging.py diff --git a/terrarium/dl_cli_tools/dl_cli_tools/py.typed b/terrarium/dl_cli_tools/dl_cli_tools/py.typed new file mode 100644 index 000000000..e69de29bb diff --git a/terrarium/dl_cli_tools/dl_cli_tools/testing/__init__.py b/terrarium/dl_cli_tools/dl_cli_tools/testing/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/terrarium/dl_cli_tools/dl_cli_tools/testing/tool_runner.py b/terrarium/dl_cli_tools/dl_cli_tools/testing/tool_runner.py new file mode 100644 index 000000000..cf790e66e --- /dev/null +++ b/terrarium/dl_cli_tools/dl_cli_tools/testing/tool_runner.py @@ -0,0 +1,27 @@ +from contextlib import redirect_stdout +import io +from typing import ( + ClassVar, + Type, +) + +import attr + +from dl_cli_tools.cli_base import CliToolBase + + +@attr.s(frozen=True) +class CliResult: + stdout: str = attr.ib(kw_only=True) + + +class CliRunner: + cli_cls: ClassVar[Type[CliToolBase]] + + def run_with_args(self, argv: list[str]) -> CliResult: + with redirect_stdout(io.StringIO()) as out_stream: + self.cli_cls.run(argv) + + assert isinstance(out_stream, io.StringIO) + result = CliResult(stdout=out_stream.getvalue()) + return result diff --git a/terrarium/dl_cli_tools/dl_cli_tools_tests/__init__.py b/terrarium/dl_cli_tools/dl_cli_tools_tests/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/terrarium/dl_cli_tools/dl_cli_tools_tests/unit/__init__.py b/terrarium/dl_cli_tools/dl_cli_tools_tests/unit/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/terrarium/dl_cli_tools/dl_cli_tools_tests/unit/conftest.py b/terrarium/dl_cli_tools/dl_cli_tools_tests/unit/conftest.py new file mode 100644 index 000000000..e69de29bb diff --git a/terrarium/dl_cli_tools/pyproject.toml b/terrarium/dl_cli_tools/pyproject.toml new file mode 100644 index 000000000..aff1b32fb --- /dev/null +++ b/terrarium/dl_cli_tools/pyproject.toml @@ -0,0 +1,39 @@ + +[tool.poetry] +name = "datalens-cli-tools" +version = "0.0.1" +description = "" +authors = ["DataLens Team "] +packages = [{include = "dl_cli_tools"}] +license = "Apache 2.0" +readme = "README.md" + + +[tool.poetry.dependencies] +attrs = ">=22.2.0" +python = ">=3.10, <3.12" +#datalens-constants = {path = "../../lib/dl_constants"} + +[tool.poetry.group.tests.dependencies] +pytest = ">=7.2.2" +[build-system] +build-backend = "poetry.core.masonry.api" +requires = [ + "poetry-core", +] + +[tool.pytest.ini_options] +minversion = "6.0" +addopts = "-ra" +testpaths = [] + + + +[datalens_ci] +skip_test = true + +[tool.mypy] +warn_unused_configs = true +disallow_untyped_defs = true +check_untyped_defs = true +strict_optional = true diff --git a/terrarium/dl_gitmanager/LICENSE b/terrarium/dl_gitmanager/LICENSE new file mode 100644 index 000000000..74ba5f6c7 --- /dev/null +++ b/terrarium/dl_gitmanager/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2023 YANDEX LLC + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/terrarium/dl_gitmanager/README.md b/terrarium/dl_gitmanager/README.md new file mode 100644 index 000000000..9b8746ce0 --- /dev/null +++ b/terrarium/dl_gitmanager/README.md @@ -0,0 +1,4 @@ +# dl_gitmanager + +A dummy package used for initialization of new library packages +either manually or via `dl_repmanager` diff --git a/terrarium/dl_gitmanager/dl_gitmanager/__init__.py b/terrarium/dl_gitmanager/dl_gitmanager/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/terrarium/dl_gitmanager/dl_gitmanager/git_manager.py b/terrarium/dl_gitmanager/dl_gitmanager/git_manager.py new file mode 100644 index 000000000..ec819fd5b --- /dev/null +++ b/terrarium/dl_gitmanager/dl_gitmanager/git_manager.py @@ -0,0 +1,70 @@ +from __future__ import annotations + +from pathlib import Path +from typing import Generator + +import attr +from git.repo.base import Repo as GitRepo +from git.diff import Diff + + +@attr.s +class GitManager: + git_repo: GitRepo = attr.ib(kw_only=True) + + def get_root_path(self) -> Path: + return Path(self.git_repo.working_tree_dir) + + def get_head_commit(self) -> str: + return self.git_repo.head.commit.hexsha + + def get_commit(self, commit_specifier: str) -> str: + return self.git_repo.commit(commit_specifier).hexsha + + def _iter_diffs(self, base: str, head: str, absolute: bool = False) -> Generator[tuple[Path, Diff], None, None]: + base_commit = self.git_repo.commit(base) + head_commit = self.git_repo.commit(head) + + base_path: Path + if absolute: + base_path = self.get_root_path() + else: + base_path = Path('.') + + # Iter own diffs + diff_index = head_commit.diff(base_commit) + for diff_item in diff_index: + yield base_path, diff_item + + # Iter submodules and get their internal + for submodule in self.git_repo.submodules: + submodule_name = submodule.name + base_tree_item = base_commit.tree[submodule_name] + head_tree_item = head_commit.tree[submodule_name] + submodule_base = base_tree_item.hexsha + submodule_head = head_tree_item.hexsha + submodule_manager = self.get_submodule_manager(submodule_name=submodule_name) + + submodule_base_path: Path + if absolute: + submodule_base_path = submodule_manager.get_root_path() + else: + submodule_base_path = Path(submodule.path) + + for _, diff_item in submodule_manager._iter_diffs(base=submodule_base, head=submodule_head): + yield submodule_base_path, diff_item + + def get_diff_paths(self, base: str, head: str, absolute: bool = False) -> list[str]: + result: set[str] = set() + for base_path, diff_item in self._iter_diffs(base=base, head=head, absolute=absolute): + if diff_item.a_path: + result.add(str(base_path / diff_item.a_path)) + if diff_item.b_path: + result.add(str(base_path / diff_item.b_path)) + + return sorted(result) + + def get_submodule_manager(self, submodule_name: str) -> GitManager: + submodule_dict = {sm.name: sm for sm in self.git_repo.submodules} + submodule = submodule_dict[submodule_name] + return type(self)(git_repo=submodule.module()) diff --git a/terrarium/dl_gitmanager/dl_gitmanager/py.typed b/terrarium/dl_gitmanager/dl_gitmanager/py.typed new file mode 100644 index 000000000..e69de29bb diff --git a/terrarium/dl_gitmanager/dl_gitmanager/scripts/__init__.py b/terrarium/dl_gitmanager/dl_gitmanager/scripts/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/terrarium/dl_gitmanager/dl_gitmanager/scripts/gitmanager_cli.py b/terrarium/dl_gitmanager/dl_gitmanager/scripts/gitmanager_cli.py new file mode 100644 index 000000000..6f78c0d16 --- /dev/null +++ b/terrarium/dl_gitmanager/dl_gitmanager/scripts/gitmanager_cli.py @@ -0,0 +1,74 @@ +from __future__ import annotations + +import argparse +import difflib +import os +from pathlib import Path +from pprint import pprint +import sys +from typing import Optional + +import attr +from git.repo.base import Repo as GitRepo + +from dl_cli_tools.cli_base import CliToolBase +from dl_cli_tools.logging import setup_basic_logging +from dl_gitmanager.git_manager import GitManager + + +@attr.s +class GitManagerTool(CliToolBase): + git_manager: GitManager = attr.ib(kw_only=True) + + @classmethod + def get_parser(cls) -> argparse.ArgumentParser: + parser = argparse.ArgumentParser(prog="Git Repository Management CLI") + + # mix-in parsers + base_parser = argparse.ArgumentParser(add_help=False) + base_parser.add_argument("--base", help="Base commit specifier", default="HEAD~1") + + head_parser = argparse.ArgumentParser(add_help=False) + head_parser.add_argument("--head", help="Head commit specifier", default="HEAD") + + base_head_parser = argparse.ArgumentParser(add_help=False, parents=[base_parser, head_parser]) + + absolute_parser = argparse.ArgumentParser(add_help=False) + absolute_parser.add_argument("--absolute", action="store_true", help="Use absolute paths") + + # commands + subparsers = parser.add_subparsers(title="command", dest="command") + + subparsers.add_parser("diff-paths", parents=[base_head_parser, absolute_parser], help="List file paths with changes") + + return parser + + def diff_paths(self, base: str, head: Optional[str], absolute: bool) -> None: + diff_name_list = self.git_manager.get_diff_paths(base=base, head=head, absolute=absolute) + print('\n'.join(diff_name_list)) + + @classmethod + def initialize(cls, git_manager: GitManager) -> GitManagerTool: + tool = cls(git_manager=git_manager) + return tool + + @classmethod + def run_parsed_args(cls, args: argparse.Namespace) -> None: + git_repo = GitRepo() + git_manager = GitManager(git_repo=git_repo) + tool = cls.initialize(git_manager=git_manager) + + match args.command: + case "diff-paths": + tool.diff_paths(base=args.base, head=args.head, absolute=args.absolute) + case _: + raise RuntimeError(f"Got unknown command: {args.command}") + + +def main() -> None: + setup_basic_logging() + GitManagerTool.run(sys.argv[1:]) + + +if __name__ == "__main__": + main() diff --git a/terrarium/dl_gitmanager/dl_gitmanager_tests/__init__.py b/terrarium/dl_gitmanager/dl_gitmanager_tests/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/terrarium/dl_gitmanager/dl_gitmanager_tests/unit/__init__.py b/terrarium/dl_gitmanager/dl_gitmanager_tests/unit/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/terrarium/dl_gitmanager/dl_gitmanager_tests/unit/conftest.py b/terrarium/dl_gitmanager/dl_gitmanager_tests/unit/conftest.py new file mode 100644 index 000000000..e69de29bb diff --git a/terrarium/dl_gitmanager/pyproject.toml b/terrarium/dl_gitmanager/pyproject.toml new file mode 100644 index 000000000..8ed4c0e8c --- /dev/null +++ b/terrarium/dl_gitmanager/pyproject.toml @@ -0,0 +1,41 @@ + +[tool.poetry] +name = "datalens-gitmanager" +version = "0.0.1" +description = "" +authors = ["DataLens Team "] +packages = [{include = "dl_gitmanager"}] +license = "Apache 2.0" +readme = "README.md" + + +[tool.poetry.dependencies] +attrs = ">=22.2.0" +python = ">=3.10, <3.12" +gitpython = ">=3.1.37" +datalens-cli-tools = {path = "../dl_cli_tools"} + +[tool.poetry.group.tests.dependencies] +pytest = ">=7.2.2" +[build-system] +build-backend = "poetry.core.masonry.api" +requires = [ + "poetry-core", +] + +[tool.poetry.scripts] +dl-git = "dl_gitmanager.scripts.gitmanager_cli:main" + +[tool.pytest.ini_options] +minversion = "6.0" +addopts = "-ra" +testpaths = [] + +[datalens_ci] +skip_test = true + +[tool.mypy] +warn_unused_configs = true +disallow_untyped_defs = true +check_untyped_defs = true +strict_optional = true diff --git a/terrarium/dl_repmanager/dl_repmanager/scripts/package_meta_cli.py b/terrarium/dl_repmanager/dl_repmanager/scripts/package_meta_cli.py index 875ffbf5b..8ed7e9ab8 100644 --- a/terrarium/dl_repmanager/dl_repmanager/scripts/package_meta_cli.py +++ b/terrarium/dl_repmanager/dl_repmanager/scripts/package_meta_cli.py @@ -8,6 +8,7 @@ import attr +from dl_cli_tools.cli_base import CliToolBase from dl_repmanager.exceptions import ( InconsistentStateError, PackageMetaCliError, @@ -16,7 +17,7 @@ DefaultFilesystemEditor, FilesystemEditor, ) -from dl_repmanager.logging import setup_basic_logging +from dl_cli_tools.logging import setup_basic_logging from dl_repmanager.mypy_stubs_sync import ( RequirementsPathProvider, stubs_sync, @@ -30,7 +31,6 @@ DEFAULT_CONFIG_FILE_NAME, discover_config, ) -from dl_repmanager.scripts.cli_base import CliToolBase log = logging.getLogger(__name__) diff --git a/terrarium/dl_repmanager/dl_repmanager/scripts/repmanager_cli.py b/terrarium/dl_repmanager/dl_repmanager/scripts/repmanager_cli.py index 76d4fccc4..84fe5d959 100644 --- a/terrarium/dl_repmanager/dl_repmanager/scripts/repmanager_cli.py +++ b/terrarium/dl_repmanager/dl_repmanager/scripts/repmanager_cli.py @@ -10,8 +10,9 @@ import attr +from dl_cli_tools.cli_base import CliToolBase +from dl_cli_tools.logging import setup_basic_logging from dl_repmanager.git_manager import GitManager -from dl_repmanager.logging import setup_basic_logging from dl_repmanager.metapkg_manager import MetaPackageManager from dl_repmanager.package_index import ( PackageIndex, @@ -33,7 +34,6 @@ RepositoryManager, ) from dl_repmanager.repository_navigator import RepositoryNavigator -from dl_repmanager.scripts.cli_base import CliToolBase from dl_repmanager.scripts.package_meta_cli import ( DlPackageMetaTool, add_package_commands, diff --git a/terrarium/dl_repmanager/dl_repmanager/scripts/scoped_metapkg_sync.py b/terrarium/dl_repmanager/dl_repmanager/scripts/scoped_metapkg_sync.py index 879ad93d8..8eff0fbd3 100644 --- a/terrarium/dl_repmanager/dl_repmanager/scripts/scoped_metapkg_sync.py +++ b/terrarium/dl_repmanager/dl_repmanager/scripts/scoped_metapkg_sync.py @@ -1,7 +1,7 @@ import argparse from pathlib import Path -from dl_repmanager.logging import setup_basic_logging +from dl_cli_tools.logging import setup_basic_logging from dl_repmanager.metapkg_scoped_sync import sync_scoped_metapkg diff --git a/terrarium/dl_repmanager/dl_repmanager_tests/unit/tool_runner.py b/terrarium/dl_repmanager/dl_repmanager_tests/unit/tool_runner.py index c2e0bd63a..e377f607d 100644 --- a/terrarium/dl_repmanager/dl_repmanager_tests/unit/tool_runner.py +++ b/terrarium/dl_repmanager/dl_repmanager_tests/unit/tool_runner.py @@ -1,35 +1,15 @@ -from contextlib import redirect_stdout -import io from pathlib import Path -from typing import ( - ClassVar, - Type, -) import attr -from dl_repmanager.scripts.cli_base import CliToolBase +from dl_cli_tools.testing.tool_runner import ( + CliResult, + CliRunner, +) from dl_repmanager.scripts.package_meta_cli import DlPackageMetaTool from dl_repmanager.scripts.repmanager_cli import DlRepManagerTool -@attr.s(frozen=True) -class CliResult: - stdout: str = attr.ib(kw_only=True) - - -class CliRunner: - cli_cls: ClassVar[Type[CliToolBase]] - - def run_with_args(self, argv: list[str]) -> CliResult: - with redirect_stdout(io.StringIO()) as out_stream: - self.cli_cls.run(argv) - - assert isinstance(out_stream, io.StringIO) - result = CliResult(stdout=out_stream.getvalue()) - return result - - @attr.s class RepoCliRunner(CliRunner): cli_cls = DlRepManagerTool diff --git a/terrarium/dl_repmanager/pyproject.toml b/terrarium/dl_repmanager/pyproject.toml index cc283887d..70748b6a3 100644 --- a/terrarium/dl_repmanager/pyproject.toml +++ b/terrarium/dl_repmanager/pyproject.toml @@ -15,6 +15,7 @@ python = ">=3.10, <3.12" pyyaml = ">=5.3.1" tomlkit = "==0.11.8" requests = ">=2.31.0" +datalens-cli-tools = {path = "../dl_cli_tools"} [tool.poetry.group.tests.dependencies] pytest = ">=7.2.2"