ae-shell 0.3.4__tar.gz → 0.3.5__tar.gz

{ae_shell-0.3.4 → ae_shell-0.3.5}/LICENSE.md

@@ -1,4 +1,4 @@
-<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.project_tpls v0.3.57 -->
+<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.project_tpls v0.3.58 -->
 ### GNU GENERAL PUBLIC LICENSE
 
 Version 3, 29 June 2007

{ae_shell-0.3.4/ae_shell.egg-info → ae_shell-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ae_shell
-Version: 0.3.4
+Version: 0.3.5
 Summary: ae namespace module portion shell: shell execution and environment helpers
 Home-page: https://gitlab.com/ae-group/ae_shell
 Author: AndiEcker
@@ -63,15 +63,15 @@ Dynamic: provides-extra
 Dynamic: requires-python
 Dynamic: summary
 
-<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project ae.ae v0.3.97 -->
-<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.namespace_root_tpls v0.3.19 -->
-# shell 0.3.4
+<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project ae.ae v0.3.100 -->
+<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.namespace_root_tpls v0.3.21 -->
+# shell 0.3.5
 
 [![GitLab develop](https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/develop?logo=python)](
     https://gitlab.com/ae-group/ae_shell)
 [![LatestPyPIrelease](
-    https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/release0.3.4?logo=python)](
-    https://gitlab.com/ae-group/ae_shell/-/tree/release0.3.4)
+    https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/release0.3.5?logo=python)](
+    https://gitlab.com/ae-group/ae_shell/-/tree/release0.3.5)
 [![PyPIVersions](https://img.shields.io/pypi/v/ae_shell)](
     https://pypi.org/project/ae-shell/#history)
 

{ae_shell-0.3.4 → ae_shell-0.3.5}/README.md

@@ -1,12 +1,12 @@
-<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project ae.ae v0.3.97 -->
-<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.namespace_root_tpls v0.3.19 -->
-# shell 0.3.4
+<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project ae.ae v0.3.100 -->
+<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.namespace_root_tpls v0.3.21 -->
+# shell 0.3.5
 
 [![GitLab develop](https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/develop?logo=python)](
     https://gitlab.com/ae-group/ae_shell)
 [![LatestPyPIrelease](
-    https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/release0.3.4?logo=python)](
-    https://gitlab.com/ae-group/ae_shell/-/tree/release0.3.4)
+    https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/release0.3.5?logo=python)](
+    https://gitlab.com/ae-group/ae_shell/-/tree/release0.3.5)
 [![PyPIVersions](https://img.shields.io/pypi/v/ae_shell)](
     https://pypi.org/project/ae-shell/#history)
 

{ae_shell-0.3.4 → ae_shell-0.3.5}/ae/shell.py

@@ -204,7 +204,7 @@ from ae.core import main_app_instance
 from ae.console import MAIN_SECTION_NAME, ConsoleApp                                        # type: ignore
 
 
-__version__ = '0.3.4'
+__version__ = '0.3.5'
 
 
 COMMIT_MSG_FILE_NAME = '.commit_msg.txt'                #: name of the file containing the commit message
@@ -1033,14 +1033,6 @@ def in_venv(name: str = "") -> Iterator[None]:
         activate_venv(old_venv)
 
 
-def on_ci_host() -> bool:
-    """ check and return True if this tool is running on the GitLab/GitHub CI host/server.
-
-    :return:                    True if running on CI host, else False
-    """
-    return 'CI' in os.environ or 'CI_PROJECT_ID' in os.environ
-
-
 def owner_project_from_url(remote_url: str) -> str:
     """ determine the owner and project name path from the specified git remote repository url.
 

{ae_shell-0.3.4 → ae_shell-0.3.5/ae_shell.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ae_shell
-Version: 0.3.4
+Version: 0.3.5
 Summary: ae namespace module portion shell: shell execution and environment helpers
 Home-page: https://gitlab.com/ae-group/ae_shell
 Author: AndiEcker
@@ -63,15 +63,15 @@ Dynamic: provides-extra
 Dynamic: requires-python
 Dynamic: summary
 
-<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project ae.ae v0.3.97 -->
-<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.namespace_root_tpls v0.3.19 -->
-# shell 0.3.4
+<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project ae.ae v0.3.100 -->
+<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.namespace_root_tpls v0.3.21 -->
+# shell 0.3.5
 
 [![GitLab develop](https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/develop?logo=python)](
     https://gitlab.com/ae-group/ae_shell)
 [![LatestPyPIrelease](
-    https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/release0.3.4?logo=python)](
-    https://gitlab.com/ae-group/ae_shell/-/tree/release0.3.4)
+    https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/release0.3.5?logo=python)](
+    https://gitlab.com/ae-group/ae_shell/-/tree/release0.3.5)
 [![PyPIVersions](https://img.shields.io/pypi/v/ae_shell)](
     https://pypi.org/project/ae-shell/#history)
 

{ae_shell-0.3.4 → ae_shell-0.3.5}/pyproject.toml

@@ -1,4 +1,4 @@
-# THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.project_tpls v0.3.57
+# THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.project_tpls v0.3.58
 [build-system]
 requires = ["setuptools>=42", "wheel"]
 build-backend = "setuptools.build_meta"

{ae_shell-0.3.4 → ae_shell-0.3.5}/setup.py

@@ -1,4 +1,4 @@
-# THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.project_tpls v0.3.57
+# THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.project_tpls v0.3.58
 """ setup of ae namespace module portion shell: shell execution and environment helpers. """
 # noinspection PyUnresolvedReferences
 import sys
@@ -23,15 +23,15 @@ setup_kwargs = {
     'install_requires': [],
     'keywords': ['configuration', 'development', 'environment', 'productivity'],
     'license': 'GPL-3.0-or-later',
-    'long_description': ('<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project ae.ae v0.3.97 -->\n'
- '<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.namespace_root_tpls v0.3.19 -->\n'
- '# shell 0.3.4\n'
+    'long_description': ('<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project ae.ae v0.3.100 -->\n'
+ '<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.namespace_root_tpls v0.3.21 -->\n'
+ '# shell 0.3.5\n'
  '\n'
  '[![GitLab develop](https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/develop?logo=python)](\n'
  '    https://gitlab.com/ae-group/ae_shell)\n'
  '[![LatestPyPIrelease](\n'
- '    https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/release0.3.4?logo=python)](\n'
- '    https://gitlab.com/ae-group/ae_shell/-/tree/release0.3.4)\n'
+ '    https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/release0.3.5?logo=python)](\n'
+ '    https://gitlab.com/ae-group/ae_shell/-/tree/release0.3.5)\n'
  '[![PyPIVersions](https://img.shields.io/pypi/v/ae_shell)](\n'
  '    https://pypi.org/project/ae-shell/#history)\n'
  '\n'
@@ -108,7 +108,7 @@ setup_kwargs = {
         'Source': 'https://ae.readthedocs.io/en/latest/_modules/ae/shell.html'},
     'python_requires': '>=3.9',
     'url': 'https://gitlab.com/ae-group/ae_shell',
-    'version': '0.3.4',
+    'version': '0.3.5',
     'zip_safe': True,
 }
 

{ae_shell-0.3.4 → ae_shell-0.3.5}/tests/test_shell.py

@@ -18,7 +18,7 @@ from tests.conftest import skip_gitlab_ci
 
 from ae.base import (
     DEF_PROJECT_PARENT_FOLDER, PY_CACHE_FOLDER,
-    camel_to_snake, in_wd, load_dotenvs, load_env_var_defaults, norm_name, norm_path,
+    camel_to_snake, in_wd, load_dotenvs, load_env_var_defaults, norm_name, norm_path, on_ci_host,
     os_path_basename, os_path_dirname, os_path_isdir, os_path_isfile, os_path_join, os_path_relpath,
     project_main_file, read_file, write_file, UNSET)
 from ae.core import DEBUG_LEVEL_DISABLED, DEBUG_LEVEL_ENABLED, DEBUG_LEVEL_VERBOSE
@@ -39,7 +39,7 @@ from ae.shell import (
     git_current_branch, git_diff, git_fetch, git_init_if_needed, git_merge, git_push,
     git_remote_domain_group, git_remotes, git_renew_remotes, git_status,
     git_tag_add, git_ref_in_branch, git_tag_list, git_tag_remotes, git_uncommitted,
-    hint, in_os_env, in_prj_dir_venv, in_venv, on_ci_host, owner_project_from_url, project_name_version,
+    hint, in_os_env, in_prj_dir_venv, in_venv, owner_project_from_url, project_name_version,
     sh_exec, sh_exit_if_exec_err, sh_exit_if_git_err, sh_log, sh_logs,
     temp_context_cleanup, temp_context_folders, temp_context_get_or_create, _temp_folders, venv_bin_path,
     MockedMainApp)
@@ -465,90 +465,45 @@ class TestGitCommands:
 
     @skip_gitlab_ci
     def test_git_branch_files_between_versions(self):
-        prj_path = norm_path("../aedev_git_repo_manager")   # ?!?!? CHANGE to pjm after switch: prj_path->"" version..v
-        exp = last_exp = {
-            'README.md',
-            'aedev/git_repo_manager.py',
-            'tests/test_git_repo_manager.py',
-        }
-
-        assert git_branch_files(prj_path, branch_or_tag="v0.3.59..v0.3.60") == exp
-
-        extra_61 = {'requirements.txt'}
-        exp = extra_61 | {
-            'README.md',
-            'aedev/git_repo_manager.py',
-        }
-
-        assert git_branch_files(prj_path, branch_or_tag="v0.3.60..v0.3.61") == exp
-
-        assert git_branch_files(prj_path, branch_or_tag="v0.3.59..v0.3.61") == exp | last_exp
-
+        prj_path = norm_path("../ae_base")
         exp = {
             'README.md',
-            'aedev/git_repo_manager/__init__.py',
-            'aedev/git_repo_manager/__main__.py',
-            'tests/test_git_repo_manager.py',
+            'ae/base.py',
+            'setup.py',
+            'tests/test_base.py',
         }
 
-        assert git_branch_files(prj_path, branch_or_tag="v0.3.65..v0.3.66") == exp
+        assert git_branch_files(prj_path, branch_or_tag="v0.3.69..v0.3.70") == exp
+        assert git_branch_files(prj_path, branch_or_tag="v0.3.70..v0.3.71") == exp
+        assert git_branch_files(prj_path, branch_or_tag="v0.3.71..v0.3.72") == exp
+        assert git_branch_files(prj_path, branch_or_tag="v0.3.69..v0.3.72") == exp
+        assert git_branch_files(prj_path, branch_or_tag="v0.3.69..v0.3.71") == exp
+        assert git_branch_files(prj_path, branch_or_tag="v0.3.70..v0.3.72") == exp
 
-        assert git_branch_files(prj_path, branch_or_tag="v0.3.65...v0.3.66") == exp
-
-        most = git_branch_files(prj_path, branch_or_tag="v0.3.65...v0.3.66", untracked=True,
-                                skip_file_path=lambda _:
-                                PY_CACHE_FOLDER in _
-                                or _.startswith(".idea")
-                                or _.startswith(".mypy_cache")
-                                or _.startswith(".pylint")
-                                or _.startswith(".pytest_cache")
-                                or _.startswith("htmlcov")
-                                or _.startswith("mypy_report")
-                                or _.startswith("aedev_git_repo_manager.egg-info")
-                                )
-        assert all(_ in most for _ in exp)
-
-        exp = big_exp = {
+        exp = {
             '.gitignore',
             '.gitlab-ci.yml',
             'CONTRIBUTING.rst',
             'LICENSE.md',
             'README.md',
             'SECURITY.md',
-            'aedev/git_repo_manager/__init__.py',
-            'aedev/git_repo_manager/__main__.py',
+            'ae/base.py',
             'dev_requirements.txt',
             'setup.py',
             'tests/conftest.py',
             'tests/requirements.txt',
+            'tests/test_base.py',
         }
 
-        assert git_branch_files(prj_path, branch_or_tag="v0.3.66..v0.3.67") == exp
-
-        assert git_branch_files(prj_path, branch_or_tag="v0.3.66...v0.3.67") == exp
-
-        extra_62 = {'pev.updates', 'tests/test_git_repo_manager.py'}
-
-        assert git_branch_files(prj_path, branch_or_tag="v0.3.61...v0.3.62") == exp | extra_62  # pkg __init__/__main__
-
-        assert git_branch_files(prj_path, branch_or_tag="v0.3.62...v0.3.63") == exp      # changed in v0.3.63
-
-        assert git_branch_files(prj_path, branch_or_tag="v0.3.66...v0.3.69") == exp      # 3 versions
-
-        exp = {
-            'README.md',
-            'aedev/git_repo_manager/__init__.py',
-            'aedev/git_repo_manager/__main__.py',
-        }
-        assert git_branch_files(prj_path, branch_or_tag="v0.3.67..v0.3.68") == exp
-
-        assert git_branch_files(prj_path, branch_or_tag="v0.3.67..v0.3.68") == exp
-
-        assert git_branch_files(prj_path, branch_or_tag="v0.3.68..v0.3.69") == exp
-
-        assert git_branch_files(prj_path, branch_or_tag="v0.3.68...v0.3.69") == exp
+        assert git_branch_files(prj_path, branch_or_tag="v0.3.64..v0.3.65") == exp
+        assert git_branch_files(prj_path, branch_or_tag="v0.3.65..v0.3.66") == exp
+        assert git_branch_files(prj_path, branch_or_tag="v0.3.66..v0.3.67") == exp | {'pyproject.toml'}
+        assert git_branch_files(prj_path, branch_or_tag="v0.3.67..v0.3.68") == exp | {'pyproject.toml'}
+        assert git_branch_files(prj_path, branch_or_tag="v0.3.68..v0.3.69") == (
+                exp | {'pyproject.toml'}) - {'tests/test_base.py'}
 
-        assert git_branch_files(prj_path, branch_or_tag="v0.3.59...v0.3.69") == extra_61 | extra_62 | big_exp
+        assert git_branch_files(prj_path, branch_or_tag="v0.3.64..v0.3.69") == exp | {'pyproject.toml'}
+        assert git_branch_files(prj_path, branch_or_tag="v0.3.64..v0.3.72") == exp | {'pyproject.toml'}
 
     def test_git_branch_files_excludes(self, changed_repo_path):
         assert git_branch_files(changed_repo_path) == {'ChangeD.y', 'deleteD.x', 'rename.it'}
@@ -1497,27 +1452,6 @@ class TestHelpers:
             assert not hint("hint command", _hint_tst_callable, "extra message")
             assert not hint("hint command", _hint_tst_callable.__name__, "extra message")
 
-    @skip_gitlab_ci
-    def test_on_ci_host_local(self):
-        assert not on_ci_host()
-
-    def test_on_ci_host_on_gitlab(self):
-        assert on_ci_host() == ('CI_PROJECT_ID' in os.environ)
-
-    @skip_gitlab_ci
-    def test_on_ci_host_with_ci_var(self, monkeypatch):
-        assert not on_ci_host()
-
-        monkeypatch.setenv('CI', "any value")
-        assert on_ci_host()
-
-    @skip_gitlab_ci
-    def test_on_ci_host_with_ci_project_id(self, monkeypatch):
-        assert not on_ci_host()
-
-        monkeypatch.setenv('CI_PROJECT_ID', "any value")
-        assert on_ci_host()
-
     def test_owner_project_from_url(self):
         assert owner_project_from_url("owner/project") == "owner/project"
         assert owner_project_from_url("owner/project.git") == "owner/project"