diff options
| author |  Jon Bernard <jbernard@jbernard.io>
| 2018-09-07 13:14:49 -0400 |
|---|---|---|
| committer | Jon Bernard <jbernard@jbernard.io>
| 2018-09-07 13:14:49 -0400 |
| commit | 75b51d82fe148637c20c9464d2a66ad10a989514 (patch) | |
| tree | a37737a60814579d99760cb6ecd8aba07c5c0e47 | |
| parent | 802de30bf4eabd3f394c02d19e61814a0c718d28 (diff) | |
| download | dotfiles-75b51d82fe148637c20c9464d2a66ad10a989514.tar.gz dotfiles-75b51d82fe148637c20c9464d2a66ad10a989514.tar.bz2 dotfiles-75b51d82fe148637c20c9464d2a66ad10a989514.zip | |
Move vendor directory to avoid pytest recursion
This simplifies the test configuration a bit and gets the vendor
directory out of the way.
| -rw-r--r-- | .gitmodules | 8 | ||||
| m--------- | .vendor/click (renamed from vendor/click) | 0 | ||||
| m--------- | .vendor/py (renamed from vendor/py) | 0 | ||||
| -rwxr-xr-x | bin/dotfiles | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/.gitmodules b/.gitmodules index e46481c..3f3dc1c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ -[submodule "vendor/click"] - path = vendor/click +[submodule "click"] + path = .vendor/click url = https://github.com/pallets/click -[submodule "vendor/py"] - path = vendor/py +[submodule "py"] + path = .vendor/py url = https://github.com/pytest-dev/py diff --git a/vendor/click b/.vendor/click -Subproject d3f36e884e18f374c3e4e6cf062ba19f100d0fd +Subproject d3f36e884e18f374c3e4e6cf062ba19f100d0fd diff --git a/vendor/py b/.vendor/py -Subproject 20fb546bc78866bd25b71624b3fd70421c3baee +Subproject 20fb546bc78866bd25b71624b3fd70421c3baee diff --git a/bin/dotfiles b/bin/dotfiles index f2e5147..01c6f07 100755 --- a/bin/dotfiles +++ b/bin/dotfiles @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os import sys @@ -6,7 +6,7 @@ import sys PROJECT_ROOT_DIRECTORY = os.path.abspath( os.path.dirname(os.path.dirname(os.path.realpath(sys.argv[0])))) -PROJECT_VENDOR_DIRECTORY = os.path.join(PROJECT_ROOT_DIRECTORY, 'vendor') +PROJECT_VENDOR_DIRECTORY = os.path.join(PROJECT_ROOT_DIRECTORY, '.vendor') if (os.path.exists(os.path.join(PROJECT_ROOT_DIRECTORY, 'dotfiles')) and PROJECT_ROOT_DIRECTORY not in sys.path): |