freeze versions for python 2.7, fix setup.py for commments breaking pip

tkruse · tkruse · commit 2af9d96e77a8 · 2020-05-05T17:15:23.000+09:00
diff --git a/setup.py b/setup.py
@@ -35,10 +35,12 @@ class Lint(Cmd):
     def run(self):
         self.execute('cpplint.py')
 
+# some pip versions bark on comments (e.g. on travis)
+def read_without_comments(filename):
+    with open(filename) as f:
+        return [l for l in f.read().splitlines() if not len(l) == 0 and not l.startswith('#')]
 
-with open('test-requirements') as f:
-    test_required = f.read().splitlines()
-
+test_required = read_without_comments('test-requirements')
 
 setup(name='cpplint',
       version=cpplint.__VERSION__,
@@ -78,7 +80,7 @@ def run(self):
       # extras_require allow pip install .[dev]
       extras_require={
           'test': test_required,
-          'dev': open('dev-requirements').read().splitlines() + test_required
+          'dev': read_without_comments('dev-requirements') + test_required
       },
       cmdclass={
           'lint': Lint
diff --git a/test-requirements b/test-requirements
@@ -2,4 +2,7 @@
 # 5.x requires python 3.5
 pytest>=4.6,<5.0
 pytest-cov
-pyparsing=2.4.0
+# freeze versions breaking python 2.7 on travis
+pyparsing<3
+zipp<=0.5.1
+configparser<=3.7.4
