Merge pull request #216 from jacebrowning/release/v2.0

Release v2.0

.appveyor.yml

@@ -2,8 +2,6 @@ environment:
   global:
     RANDOM_SEED: 0
   matrix:
-    - PYTHON_MAJOR: 3
-      PYTHON_MINOR: 6
     - PYTHON_MAJOR: 3
       PYTHON_MINOR: 7
     - PYTHON_MAJOR: 3

.isort.cfg

@@ -5,7 +5,7 @@ not_skip = __init__.py
 multi_line_output = 3
 
 known_standard_library = dataclasses,typing_extensions
-known_third_party = click,log
+known_third_party = click,log,datafiles
 known_first_party = gitman
 
 combine_as_imports = true

.mypy.ini

@@ -5,3 +5,5 @@ no_implicit_optional = true
 check_untyped_defs = true
 
 cache_dir = .cache/mypy/
+
+plugins = datafiles.plugins:mypy

.pylint.ini

@@ -127,7 +127,11 @@ disable=
     redefined-builtin,
     too-many-public-methods,
     bad-continuation,
-    subprocess-run-check,
+    no-member,
+    not-an-iterable,
+    unsupported-assignment-operation,
+    unsubscriptable-object,
+    too-many-instance-attributes,
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option

.travis.yml

@@ -2,7 +2,6 @@ dist: xenial
 
 language: python
 python:
-  - 3.6
   - 3.7
   - 3.8
 

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.0 (2020-04-13)
+
+- **BREAKING**: Removed legacy `gdm` CLI entry point.
+- **BREAKING**: Dropped support for Python 3.6.
+- Switched to `datafiles` for YAML serialization.
+
 # 1.8 (2020-04-04)
 
 - Added support Python 3.8.

gitman.yml

@@ -1,88 +1,88 @@
 location: demo
 sources:
-- name: gitman_1
-  type: git
-  repo: https://github.com/jacebrowning/gitman-demo
-  sparse_paths:
-  -
-  rev: example-branch
-  link:
-  scripts:
-  - cat .noserc
-  - make foobar
-- name: gitman_2
-  type: git
-  repo: https://github.com/jacebrowning/gitman-demo
-  sparse_paths:
-  -
-  rev: example-tag
-  link:
-  scripts:
-  -
-- name: gitman_3
-  type: git
-  repo: https://github.com/jacebrowning/gitman-demo
-  sparse_paths:
-  -
-  rev: master@{2015-06-18 11:11:11}
-  link:
-  scripts:
-  - echo "Hello, World!"
-  - pwd
-- name: gitman_4
-  type: git
-  repo: https://github.com/jacebrowning/gitman-demo
-  sparse_paths:
-  -
-  rev: example-branch-2
-  link:
-  scripts:
-  -
+  - name: gitman_1
+    type: git
+    repo: https://github.com/jacebrowning/gitman-demo
+    sparse_paths:
+      -
+    rev: example-branch
+    link:
+    scripts:
+      - cat .noserc
+      - make foobar
+  - name: gitman_2
+    type: git
+    repo: https://github.com/jacebrowning/gitman-demo
+    sparse_paths:
+      -
+    rev: example-tag
+    link:
+    scripts:
+      -
+  - name: gitman_3
+    type: git
+    repo: https://github.com/jacebrowning/gitman-demo
+    sparse_paths:
+      -
+    rev: master@{2015-06-18 11:11:11}
+    link:
+    scripts:
+      - echo "Hello, World!"
+      - pwd
+  - name: gitman_4
+    type: git
+    repo: https://github.com/jacebrowning/gitman-demo
+    sparse_paths:
+      -
+    rev: example-branch-2
+    link:
+    scripts:
+      -
 sources_locked:
-- name: gitman_1
-  type: git
-  repo: https://github.com/jacebrowning/gitman-demo
-  sparse_paths:
-  -
-  rev: 1de84ca1d315f81b035cd7b0ecf87ca2025cdacd
-  link:
-  scripts:
-  - cat .noserc
-  - make foobar
-- name: gitman_2
-  type: git
-  repo: https://github.com/jacebrowning/gitman-demo
-  sparse_paths:
-  -
-  rev: 7bd138fe7359561a8c2ff9d195dff238794ccc04
-  link:
-  scripts:
-  -
-- name: gitman_3
-  type: git
-  repo: https://github.com/jacebrowning/gitman-demo
-  sparse_paths:
-  -
-  rev: 2da24fca34af3748e3cab61db81a2ae8b35aec94
-  link:
-  scripts:
-  - echo "Hello, World!"
-  - pwd
-- name: gitman_4
-  type: git
-  repo: https://github.com/jacebrowning/gitman-demo
-  sparse_paths:
-  -
-  rev: f50c1ac8bf27377625b0cc93ea27f8069c7b513a
-  link:
-  scripts:
-  -
+  - name: gitman_1
+    type: git
+    repo: https://github.com/jacebrowning/gitman-demo
+    sparse_paths:
+      -
+    rev: 1de84ca1d315f81b035cd7b0ecf87ca2025cdacd
+    link:
+    scripts:
+      - cat .noserc
+      - make foobar
+  - name: gitman_2
+    type: git
+    repo: https://github.com/jacebrowning/gitman-demo
+    sparse_paths:
+      -
+    rev: 7bd138fe7359561a8c2ff9d195dff238794ccc04
+    link:
+    scripts:
+      -
+  - name: gitman_3
+    type: git
+    repo: https://github.com/jacebrowning/gitman-demo
+    sparse_paths:
+      -
+    rev: 2da24fca34af3748e3cab61db81a2ae8b35aec94
+    link:
+    scripts:
+      - echo "Hello, World!"
+      - pwd
+  - name: gitman_4
+    type: git
+    repo: https://github.com/jacebrowning/gitman-demo
+    sparse_paths:
+      -
+    rev: f50c1ac8bf27377625b0cc93ea27f8069c7b513a
+    link:
+    scripts:
+      -
 groups:
-- name: group_a
-  members:
-  - gitman_1
-  - gitman_4
-- name: group_b
-  members:
-  - gitman 2
-  - gitman_3
+  - name: group_a
+    members:
+      - gitman_1
+      - gitman_4
+  - name: group_b
+    members:
+      - gitman 2
+      - gitman_3

gitman/cli.py

@@ -322,7 +322,6 @@ def _run_command(function, args, kwargs):
 
 
 def _show_error(exception):
-    # TODO: require level=, evaluate all calls to dedent()
     common.dedent(0)
     common.newline()
     common.show(str(exception), color='error')

gitman/commands.py

@@ -34,14 +34,14 @@ def init():
     else:
         config = Config()
         source = Source(
-            'git',
+            type='git',
             name="sample_dependency",
             repo="https://github.com/githubtraining/hellogitworld",
         )
         config.sources.append(source)
         source = source.lock(rev="ebbbf773431ba07510251bb03f9525c7bab2b13a")
         config.sources_locked.append(source)
-        config.save()
+        config.datafile.save()
 
         msg = "Created sample config file: {}".format(config.path)
         common.show(msg, color='success')

gitman/common.py

@@ -79,8 +79,9 @@ def configure_logging(count=0):
         verbose_format = settings.VERBOSE2_LOGGING_FORMAT
 
     # Set a custom formatter
+    log.reset()
     log.init(level=level)
-    log.silence('yorm', allow_warning=True)
+    log.silence('datafiles', allow_warning=True)
     logging.captureWarnings(True)
     formatter = WarningFormatter(
         default_format, verbose_format, datefmt=settings.LOGGING_DATEFMT

gitman/git.py

@@ -43,7 +43,7 @@ def clone(type, repo, path, *, cache=settings.CACHE, sparse_paths=None, rev=None
     if not settings.CACHE_DISABLE and not os.path.isdir(reference):
         git('clone', '--mirror', repo, reference)
 
-    if sparse_paths:
+    if sparse_paths and sparse_paths[0]:
         os.mkdir(normpath)
         git('-C', normpath, 'init')
         git('-C', normpath, 'config', 'core.sparseCheckout', 'true')
@@ -256,7 +256,7 @@ def get_branch():
 
 def _get_sha_from_rev(rev):
     """Get a rev-parse string's hash."""
-    if '@{' in rev:  # TODO: use regex for this
+    if '@{' in rev:
         parts = rev.split('@')
         branch = parts[0]
         date = parts[1].strip("{}")