DEPS: Using cpplint from conda-forge (#26693)

* DEPS: Using cpplint from conda-forge
pandas-dev · Jun 7, 2019 · 35264ca · 35264ca
1 parent 649ad5c
commit 35264ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/environment.yml b/environment.yml
@@ -16,14 +16,13 @@ dependencies:
   - cython>=0.28.2
 
   # code checks
+  - cpplint
   - flake8
   - flake8-comprehensions  # used by flake8, linting of unnecessary comprehensions
   - flake8-rst>=0.6.0,<=0.7.0  # linting of code blocks in rst files
   - isort  # check that imports are in the right order
   - mypy
   - pycodestyle  # used by flake8
-  - pip:
-    - cpplint
 
   # documentation
   - gitpython  # obtain contributors from git for whatsnew

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -3,13 +3,13 @@ python-dateutil>=2.5.0
 pytz
 asv
 cython>=0.28.2
+cpplint
 flake8
 flake8-comprehensions
 flake8-rst>=0.6.0,<=0.7.0
 isort
 mypy
 pycodestyle
-cpplint
 gitpython
 sphinx
 numpydoc>=0.9.0