From 75b51d82fe148637c20c9464d2a66ad10a989514 Mon Sep 17 00:00:00 2001 From: Jon Bernard Date: Fri, 7 Sep 2018 13:14:49 -0400 Subject: Move vendor directory to avoid pytest recursion This simplifies the test configuration a bit and gets the vendor directory out of the way. --- .gitmodules | 8 ++++---- .vendor/click | 1 + .vendor/py | 1 + bin/dotfiles | 4 ++-- vendor/click | 1 - vendor/py | 1 - 6 files changed, 8 insertions(+), 8 deletions(-) create mode 160000 .vendor/click create mode 160000 .vendor/py delete mode 160000 vendor/click delete mode 160000 vendor/py 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 new file mode 160000 index 0000000..d3f36e8 --- /dev/null +++ b/.vendor/click @@ -0,0 +1 @@ +Subproject commit d3f36e884e18f374c3e4e6cf062ba19f100d0fd6 diff --git a/.vendor/py b/.vendor/py new file mode 160000 index 0000000..20fb546 --- /dev/null +++ b/.vendor/py @@ -0,0 +1 @@ +Subproject commit 20fb546bc78866bd25b71624b3fd70421c3baeea 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): diff --git a/vendor/click b/vendor/click deleted file mode 160000 index d3f36e8..0000000 --- a/vendor/click +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d3f36e884e18f374c3e4e6cf062ba19f100d0fd6 diff --git a/vendor/py b/vendor/py deleted file mode 160000 index 20fb546..0000000 --- a/vendor/py +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 20fb546bc78866bd25b71624b3fd70421c3baeea -- cgit v1.2.3