gitman 3.5__tar.gz → 3.5.2__tar.gz

{gitman-3.5 → gitman-3.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gitman
-Version: 3.5
+Version: 3.5.2
 Summary: A language-agnostic dependency manager using Git.
 Home-page: https://pypi.org/project/gitman
 License: MIT
@@ -38,9 +38,11 @@ Gitman is a language-agnostic dependency manager using Git. It aims to serve as
 
 [![Demo](https://raw.githubusercontent.com/jacebrowning/gitman/main/docs/demo.gif)](https://asciinema.org/a/3DLos4HIU84P0AfFlZMYcgPus)
 
-[![Build Status](https://img.shields.io/github/actions/workflow/status/jacebrowning/gitman/main.yml?branch=main)](https://github.com/jacebrowning/gitman/actions)
-[![Code Coverage](https://img.shields.io/codecov/c/gh/jacebrowning/gitman)](https://codecov.io/gh/jacebrowning/gitman)
-[![Code Quality](https://img.shields.io/scrutinizer/g/jacebrowning/gitman.svg?label=quiality)](https://scrutinizer-ci.com/g/jacebrowning/gitman/?branch=main)
+[![Linux Build](https://img.shields.io/github/actions/workflow/status/jacebrowning/gitman/main.yml?branch=main&label=linux)](https://github.com/jacebrowning/gitman/actions)
+[![Windows Build](https://img.shields.io/appveyor/ci/jacebrowning/gitman/main.svg?label=windows)](https://ci.appveyor.com/project/jacebrowning/gitman)
+[![Code Coverage](https://img.shields.io/codecov/c/github/jacebrowning/gitman)
+](https://codecov.io/gh/jacebrowning/gitman)
+[![Code Quality](https://img.shields.io/scrutinizer/g/jacebrowning/gitman.svg?label=quality)](https://scrutinizer-ci.com/g/jacebrowning/gitman/?branch=main)
 [![PyPI License](https://img.shields.io/pypi/l/gitman.svg)](https://pypi.org/project/gitman)
 [![PyPI Version](https://img.shields.io/pypi/v/gitman.svg?label=version)](https://pypi.org/project/gitman)
 [![PyPI Downloads](https://img.shields.io/pypi/dm/gitman.svg?color=orange)](https://pypistats.org/packages/gitman)

{gitman-3.5 → gitman-3.5.2}/README.md

@@ -4,9 +4,11 @@ Gitman is a language-agnostic dependency manager using Git. It aims to serve as
 
 [![Demo](https://raw.githubusercontent.com/jacebrowning/gitman/main/docs/demo.gif)](https://asciinema.org/a/3DLos4HIU84P0AfFlZMYcgPus)
 
-[![Build Status](https://img.shields.io/github/actions/workflow/status/jacebrowning/gitman/main.yml?branch=main)](https://github.com/jacebrowning/gitman/actions)
-[![Code Coverage](https://img.shields.io/codecov/c/gh/jacebrowning/gitman)](https://codecov.io/gh/jacebrowning/gitman)
-[![Code Quality](https://img.shields.io/scrutinizer/g/jacebrowning/gitman.svg?label=quiality)](https://scrutinizer-ci.com/g/jacebrowning/gitman/?branch=main)
+[![Linux Build](https://img.shields.io/github/actions/workflow/status/jacebrowning/gitman/main.yml?branch=main&label=linux)](https://github.com/jacebrowning/gitman/actions)
+[![Windows Build](https://img.shields.io/appveyor/ci/jacebrowning/gitman/main.svg?label=windows)](https://ci.appveyor.com/project/jacebrowning/gitman)
+[![Code Coverage](https://img.shields.io/codecov/c/github/jacebrowning/gitman)
+](https://codecov.io/gh/jacebrowning/gitman)
+[![Code Quality](https://img.shields.io/scrutinizer/g/jacebrowning/gitman.svg?label=quality)](https://scrutinizer-ci.com/g/jacebrowning/gitman/?branch=main)
 [![PyPI License](https://img.shields.io/pypi/l/gitman.svg)](https://pypi.org/project/gitman)
 [![PyPI Version](https://img.shields.io/pypi/v/gitman.svg?label=version)](https://pypi.org/project/gitman)
 [![PyPI Downloads](https://img.shields.io/pypi/dm/gitman.svg?color=orange)](https://pypistats.org/packages/gitman)

{gitman-3.5 → gitman-3.5.2}/gitman/commands.py

@@ -8,7 +8,6 @@ from startfile import startfile
 from . import common
 from .decorators import preserve_cwd
 from .models import Config, Source, find_nested_configs, load_config
-from .models.config import filter_nested_configs
 
 
 def init(*, force: bool = False):
@@ -93,7 +92,6 @@ def install(
     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
@@ -171,6 +169,7 @@ def update(
     config = load_config(root)
     configs = [config] if config else []
     configs.extend(find_nested_configs(root, depth, []))
+
     if configs:
         count = 0
         common.newline()
@@ -276,7 +275,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.5 → gitman-3.5.2}/gitman/models/config.py

@@ -1,6 +1,5 @@
 import os
 import sys
-from pathlib import Path
 from typing import Iterator, List, Optional
 
 import log
@@ -431,17 +430,17 @@ def find_nested_configs(
 
     log.debug(f"Searching for nested project in: {root}")
     for name in os.listdir(root):
-        if name.startswith("."):
+        if name[0] in {".", "_", "@"}:
+            continue
+        if name in {"build", "dist", "node_modules", "venv"}:
             continue
         path = os.path.join(root, name)
-        if os.path.isdir(path) and path not in skip_paths and not os.path.islink(path):
-            config = load_config(path, search=False)
-            if config:
+        if path in skip_paths:
+            continue
+        if os.path.isdir(path) and not os.path.islink(path):
+            if config := load_config(path, search=False):
                 configs.append(config)
 
-            if os.path.islink(path):
-                continue
-
             if depth is not None:
                 configs.extend(find_nested_configs(path, depth - 1, skip_paths))
             else:
@@ -465,20 +464,3 @@ def _valid_filename(filename):
     if name.startswith("."):
         name = name[1:]
     return name in {"gitman", "gdm"} and ext in {".yml", ".yaml"}
-
-
-def filter_nested_configs(configs: List[Config]) -> List[Config]:
-    """Filter subdirectories inside of parent 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 filtered_configs

{gitman-3.5 → gitman-3.5.2}/gitman/tests/conftest.py

@@ -24,8 +24,6 @@ def pytest_configure(config):
 def pytest_runtest_setup(item):
     """Disable file storage during unit tests."""
     if "integration" in item.keywords:
-        if os.name == "nt":
-            pytest.skip("Integration tests not supported on Windows")
         if not os.getenv(ENV):
             pytest.skip(REASON)
         else:

{gitman-3.5 → gitman-3.5.2}/gitman/tests/test_models_config.py

@@ -5,8 +5,7 @@ import os
 import pytest
 from expecter import expect
 
-from gitman.models import Config, find_nested_configs, load_config
-from gitman.models.config import filter_nested_configs
+from gitman.models import Config, load_config
 
 from .conftest import FILES
 
@@ -149,16 +148,3 @@ 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.5 → gitman-3.5.2}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 
 name = "gitman"
-version = "3.5"
+version = "3.5.2"
 description = "A language-agnostic dependency manager using Git."
 
 license = "MIT"
@@ -76,7 +76,7 @@ coveragespace = "^6.1"
 mkdocs = "^1.2.3"
 mkdocstrings = "^0.18.1"
 pygments = "^2.15.0"
-jinja2 = "~3.1.3"
+jinja2 = "~3.1.4"
 
 # Tooling
 pyinstaller = "^4.0"