Use Makefile to substitute install.sh

Clcanny · Jun 25, 2020 · 0165b4d · 0165b4d
1 parent efce995
commit 0165b4d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 40 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
 *.pyc
-thirdparty/**
 config/**
 build/**
diff --git a/Makefile b/Makefile
@@ -19,6 +19,8 @@ isort: $(BUILD_VIRTUAL_ENV)/bin/isort
 
 yapf: $(BUILD_VIRTUAL_ENV)/bin/yapf
 	$(BUILD_VIRTUAL_ENV)/bin/yapf --help
+	mkdir -p config
+	$(BUILD_VIRTUAL_ENV)/bin/yapf --style="google" --style-help > config/yapf.cfg
 
 check: isort yapf
 

diff --git a/install.sh b/install.sh
diff --git a/python/python_formatter.py b/python/python_formatter.py
@@ -6,17 +6,16 @@ class PythonFormatter(AbstractFormatter):
 
     def __init__(self):
         super(self.__class__, self).__init__()
-        yapfDir = self._getAbsPath(self._getRootDir(), "thirdparty", "yapf")
-        self._yapf = "PYTHONPATH={}/build/lib/python {}/build/bin/yapf".format(
-            yapfDir, yapfDir)
+        self._yapf = self._getAbsPath(self._getRootDir(), "build/venv/bin/yapf")
+        self._isort = self._getAbsPath(self._getRootDir(),
+                                       "build/venv/bin/isort")
 
     def _getGuideFilename(self):
         # return vim.eval("s:VimFormatterPythonStyle")
         return None
 
     def _getFormatCommand(self, formattedFilename, guideFilename):
         guideFilename = vim.eval("g:VimFormatterPythonStyle")
-        isort = "{}/build/venv/bin/isort".format(self._getRootDir())
         cmd = '{} --stdout "{}" | {} --style="{}"'.format(
-            isort, formattedFilename, self._yapf, guideFilename)
+            self._isort, formattedFilename, self._yapf, guideFilename)
         return cmd