gitman 3.4b3__tar.gz → 3.4.1b2__tar.gz

{gitman-3.4b3 → gitman-3.4.1b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gitman
-Version: 3.4b3
+Version: 3.4.1b2
 Summary: A language-agnostic dependency manager using Git.
 Home-page: https://pypi.org/project/gitman
 License: MIT
@@ -20,15 +20,12 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Topic :: Software Development :: Version Control
 Classifier: Topic :: System :: Software Distribution
-Requires-Dist: datafiles (>=2.0,<3.0)
+Requires-Dist: datafiles (>=2.1.2,<3.0.0)
 Requires-Dist: minilog (>=2.1,<3.0)
 Requires-Dist: universal-startfile (>=0.2,<0.3)
 Project-URL: Documentation, https://gitman.readthedocs.io

{gitman-3.4b3 → gitman-3.4.1b2}/gitman/cli.py

@@ -118,6 +118,13 @@ def main(args=None, function=None):
         action="store_true",
         dest="no_defaults",
     )
+    sub.add_argument(
+        "-S",
+        "--no-scripts",
+        help="skip running scripts after installation",
+        action="store_true",
+        dest="no_scripts",
+    )
 
     # Update parser
     info = "update dependencies to the latest versions"
@@ -144,6 +151,13 @@ def main(args=None, function=None):
         default=None,
         help="disable recording of updated versions",
     )
+    sub.add_argument(
+        "-S",
+        "--no-scripts",
+        help="skip running scripts after installation",
+        action="store_true",
+        dest="no_scripts",
+    )
 
     # List parser
     info = "display the current version of each dependency"
@@ -168,7 +182,7 @@ def main(args=None, function=None):
         "lock",
         description=info.capitalize() + ".",
         help=info,
-        parents=[debug, project],
+        parents=[debug, project, depth],
         formatter_class=common.WideHelpFormatter,
     )
     sub.add_argument("name", nargs="*", help="list of dependency names to lock")
@@ -262,6 +276,7 @@ def _get_command(function, namespace):
             force_interactive=namespace.force_interactive,
             clean=namespace.clean,
             skip_changes=namespace.skip_changes,
+            skip_scripts=namespace.no_scripts,
         )
         if namespace.command == "install":
             kwargs.update(
@@ -287,6 +302,7 @@ def _get_command(function, namespace):
         args = namespace.name
         kwargs.update(
             root=namespace.root,
+            depth=namespace.depth,
         )
 
     elif namespace.command == "uninstall":

{gitman-3.4b3 → gitman-3.4.1b2}/gitman/commands.py

@@ -62,6 +62,7 @@ def install(
     clean=True,
     skip_changes=False,
     skip_default_group=False,
+    skip_scripts=False,
 ):
     """Install dependencies for a project.
 
@@ -80,6 +81,7 @@ def install(
      should be skipped
     - `skip_default_group`: indicates default_group should be skipped if
      `*names` is empty
+    - `skip_scripts`: indicates scripts should be skipped
     """
     log.info(
         "%sInstalling dependencies: %s",
@@ -90,10 +92,8 @@ def install(
 
     config = load_config(root)
     configs = [config] if config else []
-    nested_configs = find_nested_configs(root, depth, [])
-    if config is not None:
-        nested_configs = filter_nested_configs(config, nested_configs)
-    configs.extend(nested_configs)
+    configs.extend(find_nested_configs(root, depth, []))
+    configs = filter_nested_configs(configs)
 
     if configs:
         count = 0
@@ -117,7 +117,7 @@ def install(
         )
         count += _count  # type: ignore
 
-        if _count:
+        if _count and not skip_scripts:
             label = "nested scripts" if index else "scripts"
             common.show(f"Running {label}...", color="message", log=False)
             common.newline()
@@ -138,6 +138,7 @@ def update(
     lock=None,  # pylint: disable=redefined-outer-name
     skip_changes=False,
     skip_default_group=False,
+    skip_scripts=False,
 ):
     """Update dependencies for a project.
 
@@ -157,6 +158,7 @@ def update(
      should be skipped
     - `skip_default_group`: indicates default_group should be skipped if
      `*names` is empty
+    - `skip_scripts`: indicates scripts should be skipped
     """
     log.info(
         "%s dependencies%s: %s",
@@ -200,7 +202,7 @@ def update(
                 skip_changes=skip_changes or force_interactive,
             )
 
-        if _count:
+        if _count and not skip_scripts:
             label = "nested scripts" if index else "scripts"
             common.show(f"Running {label}...", color="message", log=False)
             common.newline()
@@ -274,6 +276,7 @@ def lock(*names, depth=None, root=None):
     config = load_config(root)
     configs = [config] if config else []
     configs.extend(find_nested_configs(root, depth, []))
+    configs = filter_nested_configs(configs)
     if configs:
         count = 0
         common.newline()

{gitman-3.4b3 → gitman-3.4.1b2}/gitman/models/config.py

@@ -6,7 +6,7 @@ from typing import Iterator, List, Optional
 import log
 from datafiles import datafile, field
 
-from .. import common, exceptions, settings, shell
+from .. import common, exceptions, shell
 from ..decorators import preserve_cwd
 from .group import Group
 from .source import Identity, Source
@@ -426,7 +426,7 @@ def find_nested_configs(
     root = os.path.abspath(root) if root else _resolve_current_directory()
     configs: List[Config] = []
 
-    if (depth is not None and depth <= 1) or settings.CI:
+    if depth is not None and depth <= 1:
         return configs
 
     log.debug(f"Searching for nested project in: {root}")
@@ -467,15 +467,18 @@ def _valid_filename(filename):
     return name in {"gitman", "gdm"} and ext in {".yml", ".yaml"}
 
 
-def filter_nested_configs(
-    top_level_config: Config, nested_configs: List[Config]
-) -> List[Config]:
+def filter_nested_configs(configs: List[Config]) -> List[Config]:
     """Filter subdirectories inside of parent config."""
-    configs = []
-    config_location_path = Path(top_level_config.location_path)
-    for nested_config in nested_configs:
-        nested_config_root = Path(nested_config.location_path)
-        if config_location_path in nested_config_root.parents:
-            configs.append(nested_config)
+    filtered_configs = []
+    for config_a in configs:
+        is_nested = False
+        for config_b in configs:
+            if config_a == config_b:
+                continue
+            if Path(config_b.location_path) in Path(config_a.location_path).parents:
+                is_nested = True
+                break
+        if not is_nested:
+            filtered_configs.append(config_a)
 
-    return configs
+    return filtered_configs

{gitman-3.4b3 → gitman-3.4.1b2}/gitman/plugin.py

@@ -62,6 +62,13 @@ def main(args=None):
         action="store_true",
         dest="no_defaults",
     )
+    parser.add_argument(
+        "-S",
+        "--no-scripts",
+        help="skip running scripts after installation",
+        action="store_true",
+        dest="no_scripts",
+    )
 
     # Update option
     group.add_argument(

{gitman-3.4b3 → gitman-3.4.1b2}/gitman/tests/test_cli.py

@@ -77,6 +77,7 @@ class TestInstall:
             fetch=False,
             clean=False,
             skip_changes=False,
+            skip_scripts=False,
             skip_default_group=False,
         )
 
@@ -93,6 +94,7 @@ class TestInstall:
             fetch=False,
             clean=False,
             skip_changes=False,
+            skip_scripts=False,
             skip_default_group=False,
         )
 
@@ -109,6 +111,7 @@ class TestInstall:
             fetch=False,
             clean=False,
             skip_changes=False,
+            skip_scripts=False,
             skip_default_group=False,
         )
 
@@ -125,6 +128,7 @@ class TestInstall:
             fetch=True,
             clean=False,
             skip_changes=False,
+            skip_scripts=False,
             skip_default_group=False,
         )
 
@@ -141,6 +145,7 @@ class TestInstall:
             fetch=False,
             clean=True,
             skip_changes=False,
+            skip_scripts=False,
             skip_default_group=False,
         )
 
@@ -159,6 +164,7 @@ class TestInstall:
             fetch=False,
             clean=False,
             skip_changes=False,
+            skip_scripts=False,
             skip_default_group=False,
         )
 
@@ -175,6 +181,7 @@ class TestInstall:
             fetch=False,
             clean=False,
             skip_changes=False,
+            skip_scripts=False,
             skip_default_group=False,
         )
 
@@ -204,6 +211,7 @@ class TestUpdate:
             recurse=False,
             lock=None,
             skip_changes=False,
+            skip_scripts=False,
         )
 
     @patch("gitman.commands.update")
@@ -220,6 +228,7 @@ class TestUpdate:
             recurse=True,
             lock=None,
             skip_changes=False,
+            skip_scripts=False,
         )
 
     @patch("gitman.commands.update")
@@ -236,6 +245,7 @@ class TestUpdate:
             recurse=False,
             lock=False,
             skip_changes=False,
+            skip_scripts=False,
         )
 
     @patch("gitman.commands.update")
@@ -252,6 +262,7 @@ class TestUpdate:
             recurse=False,
             lock=None,
             skip_changes=True,
+            skip_scripts=False,
         )
 
     @patch("gitman.commands.update")
@@ -268,6 +279,7 @@ class TestUpdate:
             recurse=False,
             lock=None,
             skip_changes=False,
+            skip_scripts=False,
         )
 
     @patch("gitman.commands.update")
@@ -284,6 +296,7 @@ class TestUpdate:
             recurse=False,
             lock=None,
             skip_changes=False,
+            skip_scripts=False,
         )
 
     @patch("gitman.commands.update")
@@ -302,6 +315,7 @@ class TestUpdate:
             recurse=False,
             lock=None,
             skip_changes=False,
+            skip_scripts=False,
         )
 
     @patch("gitman.commands.update")
@@ -318,6 +332,7 @@ class TestUpdate:
             recurse=False,
             lock=None,
             skip_changes=False,
+            skip_scripts=False,
         )
 
 
@@ -359,12 +374,12 @@ def describe_lock():
     @patch("gitman.commands.lock")
     def with_no_arguments(lock):
         cli.main(["lock"])
-        lock.assert_called_once_with(root=None)
+        lock.assert_called_once_with(root=None, depth=5)
 
     @patch("gitman.commands.lock")
     def with_dependencies(lock):
         cli.main(["lock", "foo", "bar"])
-        lock.assert_called_once_with("foo", "bar", root=None)
+        lock.assert_called_once_with("foo", "bar", root=None, depth=5)
 
 
 class TestUninstall:

{gitman-3.4b3 → gitman-3.4.1b2}/gitman/tests/test_models_config.py

@@ -5,7 +5,8 @@ import os
 import pytest
 from expecter import expect
 
-from gitman.models import Config, load_config
+from gitman.models import Config, find_nested_configs, load_config
+from gitman.models.config import filter_nested_configs
 
 from .conftest import FILES
 
@@ -148,3 +149,16 @@ class TestLoad:
         config = load_config()
 
         assert None is config
+
+    @pytest.mark.integration
+    def test_filter_nested_config(self):
+        """Verify that filter_nested_config removes nested configs"""
+        config = load_config(FILES)
+        assert None is not config
+        count = config.install_dependencies(depth=2)
+        assert 5 == count
+        configs = [config] if config else []
+        configs.extend(find_nested_configs(FILES, depth=2, skip_paths=[]))
+        assert 2 == len(configs)
+        configs = filter_nested_configs(configs)
+        assert 1 == len(configs)

{gitman-3.4b3 → gitman-3.4.1b2}/gitman/tests/test_plugin.py

@@ -6,7 +6,6 @@ from gitman import plugin
 
 
 class TestMain:
-
     """Unit tests for the top-level arguments."""
 
     @patch("gitman.cli.commands")
@@ -25,6 +24,7 @@ class TestMain:
                 force=False,
                 force_interactive=False,
                 skip_changes=False,
+                skip_scripts=False,
                 skip_default_group=False,
             ),
             call.install().__bool__(),  # command status check
@@ -47,6 +47,7 @@ class TestMain:
                 recurse=False,
                 lock=True,
                 skip_changes=False,
+                skip_scripts=False,
             ),
             call.update().__bool__(),  # command status check
         ] == mock_commands.mock_calls
@@ -68,6 +69,7 @@ class TestMain:
                 recurse=True,
                 lock=True,
                 skip_changes=False,
+                skip_scripts=False,
             ),
             call.update().__bool__(),  # command status check
         ] == mock_commands.mock_calls
@@ -89,6 +91,7 @@ class TestMain:
                 recurse=False,
                 lock=False,
                 skip_changes=False,
+                skip_scripts=False,
             ),
             call.update().__bool__(),  # command status check
         ] == mock_commands.mock_calls
@@ -110,6 +113,7 @@ class TestMain:
                 recurse=False,
                 lock=True,
                 skip_changes=True,
+                skip_scripts=False,
             ),
             call.update().__bool__(),  # command status check
         ] == mock_commands.mock_calls

{gitman-3.4b3 → gitman-3.4.1b2}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 
 name = "gitman"
-version = "3.4b3"
+version = "3.4.1b2"
 description = "A language-agnostic dependency manager using Git."
 
 license = "MIT"
@@ -33,6 +33,7 @@ classifiers = [
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
     "Topic :: Software Development",
     "Topic :: Software Development :: Build Tools",
     "Topic :: Software Development :: Version Control",
@@ -43,7 +44,7 @@ classifiers = [
 
 python = "^3.8"
 
-datafiles = "^2.0"
+datafiles = "^2.1.2"
 minilog = "^2.1"
 universal-startfile = "~0.2"
 
@@ -54,15 +55,15 @@ black = "^22.1"
 isort = "^5.10"
 
 # Linters
-mypy = "~0.940"
+mypy = "^1.3"
 pydocstyle = "*"
 pylint = "~2.6"
 types-freezegun = "*"
 types-setuptools = "*"
 
 # Testing
-pytest = "^6"
-pytest-cov = "*"
+pytest = "^7.3"
+pytest-cov = "^4.1"
 pytest-describe = "^2.0"
 pytest-expecter = "^3.0"
 pytest-random = "*"
@@ -74,15 +75,15 @@ coveragespace = "^6.0"
 # Documentation
 mkdocs = "^1.2.3"
 mkdocstrings = "^0.18.1"
-pygments = "^2.7.4"
-jinja2 = "~3.0.3"
+pygments = "^2.15.0"
+jinja2 = "~3.1.3"
 
 # Tooling
 pyinstaller = "^4.0"
 sniffer = "*"
 macfsevents = { version = "*", platform = "darwin" }
 pync = { version = "*", platform = "darwin" }
-rope = "^0.14.0"
+rope = "^0.14"
 
 [tool.poetry.scripts]
 

gitman-3.4b3/setup.py

@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-from setuptools import setup
-
-packages = \
-['gitman', 'gitman.models', 'gitman.tests']
-
-package_data = \
-{'': ['*'],
- 'gitman.tests': ['files/*',
-                  'files/subdir/*',
-                  'files/subdir/subsubdir/*',
-                  'files/subdir/subsubdir/skip/subsubsubsubdir/*']}
-
-install_requires = \
-['datafiles>=2.0,<3.0', 'minilog>=2.1,<3.0', 'universal-startfile>=0.2,<0.3']
-
-entry_points = \
-{'console_scripts': ['git-deps = gitman.plugin:main',
-                     'gitman = gitman.cli:main']}
-
-setup_kwargs = {
-    'name': 'gitman',
-    'version': '3.4b3',
-    'description': 'A language-agnostic dependency manager using Git.',
-    'long_description': '## Overview\n\nGitman is a language-agnostic dependency manager using Git. It aims to serve as a submodules replacement and provides advanced options for managing versions of nested Git repositories.\n\n[![Demo](https://raw.githubusercontent.com/jacebrowning/gitman/main/docs/demo.gif)](https://asciinema.org/a/3DLos4HIU84P0AfFlZMYcgPus)\n\n[![Unix Build Status](https://img.shields.io/travis/com/jacebrowning/gitman/main.svg?label=unix)](https://travis-ci.com/jacebrowning/gitman)\n[![Windows Build Status](https://img.shields.io/appveyor/ci/jacebrowning/gitman/main.svg?label=window)](https://ci.appveyor.com/project/jacebrowning/gitman)\n[![Coverage Status](https://img.shields.io/coveralls/jacebrowning/gitman/main.svg)](https://coveralls.io/r/jacebrowning/gitman)\n[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/jacebrowning/gitman.svg)](https://scrutinizer-ci.com/g/jacebrowning/gitman/?branch=main)\n[![PyPI License](https://img.shields.io/pypi/l/gitman.svg)](https://pypi.org/project/gitman)\n[![PyPI Version](https://img.shields.io/pypi/v/gitman.svg)](https://pypi.org/project/gitman)\n[![PyPI Downloads](https://img.shields.io/pypi/dm/gitman.svg?color=orange)](https://pypistats.org/packages/gitman)\n\n## Setup\n\n### Requirements\n\n- Python 3.8+\n- Git 2.8+ (with [stored credentials](http://gitman.readthedocs.io/en/latest/setup/git/))\n\n### Installation\n\nInstall this tool globally with [pipx](https://pipxproject.github.io/pipx/) (or pip):\n\n```sh\n$ pipx install gitman\n```\nor add it to your [Poetry](https://python-poetry.org/docs/) project:\n\n```sh\n$ poetry add gitman\n```\n\n### Configuration\n\nGenerate a sample config file:\n\n```sh\n$ gitman init\n```\n\nor manually create one (`gitman.yml` or `.gitman.yml`) in the root of your working tree:\n\n```yaml\nlocation: vendor/gitman\n\nsources:\n  - repo: "https://github.com/kstenerud/iOS-Universal-Framework"\n    name: framework\n    rev: Mk5-end-of-life\n  - repo: "https://github.com/jonreid/XcodeCoverage"\n    name: coverage\n    links:\n      - target: Tools/XcodeCoverage\n  - repo: "https://github.com/dxa4481/truffleHog"\n    name: trufflehog\n    rev: master\n    scripts:\n      - chmod a+x truffleHog/truffleHog.py\n  - repo: "https://github.com/FortAwesome/Font-Awesome"\n    name: fontawesome\n    rev: master\n    sparse_paths:\n      - "webfonts/*"\n  - repo: "https://github.com/google/material-design-icons"\n    name: material-design-icons\n    rev: master\n\ngroups:\n  - name: code\n    members:\n      - framework\n      - trufflehog\n  - name: resources\n    members:\n      - fontawesome\n      - material-design-icons\n\ndefault_group: code\n```\n\nIgnore the dependency storage location:\n\n```sh\n$ echo vendor/gitman >> .gitignore\n```\n\n## Usage\n\nSee the available commands:\n\n```sh\n$ gitman --help\n```\n\n### Updating Dependencies\n\nGet the latest versions of all dependencies:\n\n```sh\n$ gitman update\n```\n\nwhich will essentially:\n\n1. Create a working tree at `<root>`/`<location>`/`<name>`\n2. Fetch from `repo` and checkout the specified `rev`\n3. Symbolically link each `<location>`/`<name>` from `<root>`/`<link>` (if specified)\n4. Repeat for all nested working trees containing a config file\n5. Record the actual commit SHAs that were checked out (with `--lock` option)\n6. Run optional post-install scripts for each dependency\n\nwhere `rev` can be:\n\n- all or part of a commit SHA: `123def`\n- a tag: `v1.0`\n- a branch: `main`\n- a `rev-parse` date: `\'main@{2015-06-18 10:30:59}\'`\n\nAlternatively, get the latest versions of specific dependencies:\n\n```sh\n$ gitman update framework\n```\n\nor named groups:\n\n```sh\n$ gitman update resources\n```\n\n### Restoring Previous Versions\n\nDisplay the versions that are currently installed:\n\n```sh\n$ gitman list\n```\n\nReinstall these specific versions at a later time:\n\n```sh\n$ gitman install\n```\n\n### Deleting Dependencies\n\nRemove all installed dependencies:\n\n```sh\n$ gitman uninstall\n```\n\n## Resources\n\n- [Source code](https://github.com/jacebrowning/gitman)\n- [Issue tracker](https://github.com/jacebrowning/gitman/issues)\n- [Release history](https://github.com/jacebrowning/gitman/blob/main/CHANGELOG.md)\n',
-    'author': 'Jace Browning',
-    'author_email': 'jacebrowning@gmail.com',
-    'maintainer': 'None',
-    'maintainer_email': 'None',
-    'url': 'https://pypi.org/project/gitman',
-    'packages': packages,
-    'package_data': package_data,
-    'install_requires': install_requires,
-    'entry_points': entry_points,
-    'python_requires': '>=3.8,<4.0',
-}
-
-
-setup(**setup_kwargs)