From c452d8cc82659b235eac3795a0c5604775d75f0a Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Thu, 6 Jun 2019 16:50:01 +0100 Subject: [PATCH 1/2] DEPS: Using cpplint from conda-forge --- environment.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index e5d62d53d86a5..df23f34b07cdc 100644 --- a/environment.yml +++ b/environment.yml @@ -22,8 +22,7 @@ dependencies: - isort # check that imports are in the right order - mypy - pycodestyle # used by flake8 - - pip: - - cpplint + - cpplint # documentation - gitpython # obtain contributors from git for whatsnew From 7dbda9d858e6b165ca873545f1f0ccd452502f89 Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Thu, 6 Jun 2019 16:56:40 +0100 Subject: [PATCH 2/2] Sorting deps (cpplint) and sync requirements --- environment.yml | 2 +- requirements-dev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index df23f34b07cdc..897fd34ebb803 100644 --- a/environment.yml +++ b/environment.yml @@ -16,13 +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 - - cpplint # documentation - gitpython # obtain contributors from git for whatsnew diff --git a/requirements-dev.txt b/requirements-dev.txt index 98c75f1ded07e..f5309df5aa6ce 100644 --- 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