diff options
| author | David Bradford <david.bradford@mongodb.com> | 2020-06-03 18:12:06 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-06-04 12:54:42 +0000 |
| commit | d36d5430d7aefc844a2020064703df4fff7d6dcd (patch) | |
| tree | 2548dd5909681897678b60e88f16ce5546c8f210 | |
| parent | def02ddab1c5b547126dbcfb719bf3159c9b7c98 (diff) | |
| download | mongo-d36d5430d7aefc844a2020064703df4fff7d6dcd.tar.gz | |
SERVER-48579: Merge lint python requirements files
(cherry picked from commit 55181caa3aefad966a240d97a9f5ca4f24815b0c)
| -rw-r--r-- | etc/pip/components/lint.req | 10 | ||||
| -rw-r--r-- | etc/pip/components/mypy.req | 3 | ||||
| -rw-r--r-- | etc/pip/lint-requirements.txt | 1 | ||||
| -rw-r--r-- | etc/pip/toolchain-requirements.txt | 1 |
4 files changed, 6 insertions, 9 deletions
diff --git a/etc/pip/components/lint.req b/etc/pip/components/lint.req index 34f84c9cfcd..4ef690724ec 100644 --- a/etc/pip/components/lint.req +++ b/etc/pip/components/lint.req @@ -1,8 +1,10 @@ # Linters # Note: These versions are checked by python modules in buildscripts/linter/ -pylint == 2.3.1 -yapf == 0.26.0 -pydocstyle == 2.1.1 -yamllint == 1.15.0 GitPython ~= 2.1.11 +mypy == 0.580; python_version > "3.4" +pydocstyle == 2.1.1 +pylint == 2.3.1 structlog ~= 19.1.0 +typing +yamllint == 1.15.0 +yapf == 0.26.0 diff --git a/etc/pip/components/mypy.req b/etc/pip/components/mypy.req deleted file mode 100644 index fcf8ad90f2a..00000000000 --- a/etc/pip/components/mypy.req +++ /dev/null @@ -1,3 +0,0 @@ -# Note: This version is checked by python modules in buildscripts/linter/ -mypy == 0.580; python_version > "3.4" -typing diff --git a/etc/pip/lint-requirements.txt b/etc/pip/lint-requirements.txt index 8f136e14230..da0d870067c 100644 --- a/etc/pip/lint-requirements.txt +++ b/etc/pip/lint-requirements.txt @@ -2,4 +2,3 @@ -r components/core.req -r components/lint.req --r components/mypy.req diff --git a/etc/pip/toolchain-requirements.txt b/etc/pip/toolchain-requirements.txt index 099f43b4386..165d1fe5a2a 100644 --- a/etc/pip/toolchain-requirements.txt +++ b/etc/pip/toolchain-requirements.txt @@ -6,7 +6,6 @@ -r components/compile.req -r components/evergreen.req -r components/lint.req --r components/mypy.req -r components/resmoke.req -r components/idl.req |