Convert fix-includes to pip

benjaminjkraft · benjaminjkraft · commit 57d2cbdb90ea · 2018-02-02T11:45:54.000-08:00
It's in pip now!  No more submodules.  While I was at it, I added a
`make deps`, and fixed some lint errors I noticed.

Test plan: `make deps lint test`

Auditors: csilvers
diff --git a/.flake8 b/.flake8
@@ -1,2 +1,2 @@
 [flake8]
-exclude = .git,fix-includes,fix_python_imports.py,testdata
+exclude = .git,testdata
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "fix-includes"]
-	path = fix-includes
-	url = git@github.com:Khan/fix-includes.git
diff --git a/Makefile b/Makefile
@@ -1,3 +1,6 @@
+deps:
+	pip install -r requirements.txt
+
 test:
 	python -m unittest discover
 
diff --git a/fix-includes b/fix-includes
diff --git a/fix_python_imports.py b/fix_python_imports.py
diff --git a/moves.py b/moves.py
@@ -169,5 +169,4 @@ def suggestor(filename, body):
         for patch in _add_init_py(new_filename):
             yield patch
 
-
     return suggestor
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,6 @@
 asttokens
 tqdm
+fix-includes==0.1
 
 # TODO(benkraft): put this in a separate requirements.dev.txt
 flake8
diff --git a/slicker.py b/slicker.py
@@ -81,7 +81,8 @@
 import sys
 import tokenize
 
-import fix_python_imports
+from fix_includes import fix_python_imports
+
 import inputs
 import khodemod
 import moves
diff --git a/test_slicker.py b/test_slicker.py
@@ -1249,7 +1249,6 @@ def test_none(self):
             'import foo.bar', 'import baz.bang')
 
 
-
 class FixMovedRegionSuggestorTest(TestBase):
     def test_rename_references_self(self):
         self.write_file('foo.py',

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`[flake8]`
`2`		`-exclude = .git,fix-includes,fix_python_imports.py,testdata`
	`2`	`+exclude = .git,testdata`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +0,0 @@`
`1`		`-[submodule "fix-includes"]`
`2`		`- path = fix-includes`
`3`		`- url = [email protected]:Khan/fix-includes.git`