Merge branch 'main' into update_bazel_script
diff --git a/.circleci/config.yml b/.circleci/config.yml
index c4d2734..bc573c1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -60,9 +60,9 @@
apt-get install -q -y python-pip python3-pip
- run: python2 -m pip install --upgrade pip
- run: python3 -m pip install --upgrade pip
- - run: python2 -m pip install flake8==3.7.8
- - run: python3 -m pip install flake8==3.7.8
- - run: python2 -m flake8 --show-source --statistics
+ - run: python2 -m pip install flake8==3.9.2
+ - run: python3 -m pip install flake8==3.9.2
+ - run: python2 -m flake8 --show-source --statistics --extend-exclude=./scripts
- run: python3 -m flake8 --show-source --statistics
test-linux:
executor: bionic
diff --git a/.flake8 b/.flake8
index 4a0ec27..e49d748 100644
--- a/.flake8
+++ b/.flake8
@@ -5,19 +5,20 @@
E501, # Line too long
E121, # Continuation line under-indented for hanging indent
E722 # bare excepts
+ E741, # Variable names such as 'l', 'O', or 'I'
exclude =
- ./llvm
- ./gnu
- ./upstream
- ./fastcomp
- ./fastcomp-clang
- ./releases
- ./clang
- ./emscripten
- ./binaryen
- ./git
- ./node
- ./python
- ./temp
- ./downloads
- ./crunch
+ ./llvm,
+ ./gnu,
+ ./upstream,
+ ./fastcomp,
+ ./fastcomp-clang,
+ ./releases,
+ ./clang,
+ ./emscripten,
+ ./binaryen,
+ ./git,
+ ./node,
+ ./python,
+ ./temp,
+ ./downloads,
+ ./crunch,