From e22cd02a0f5b35984ab6a77556c3ad106f991000 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Wed, 23 Aug 2023 15:35:01 -0700 Subject: [PATCH 01/16] test of the py2 linter --- scripts/create_release.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/create_release.py b/scripts/create_release.py index 418dcabae0..90f9a66b77 100755 --- a/scripts/create_release.py +++ b/scripts/create_release.py @@ -23,6 +23,7 @@ def version_key(version_string): def main(args): if subprocess.check_output(['git', 'status', '--porcelain'], cwd=root_dir).strip(): print('tree is not clean') + # This is a bogus change sys.exit(1) release_info = emsdk.load_releases_info() From 03433b449827087c503e6dd71e6db9f4d88a0099 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Wed, 23 Aug 2023 15:42:55 -0700 Subject: [PATCH 02/16] use py3 syntax --- scripts/create_release.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/create_release.py b/scripts/create_release.py index 90f9a66b77..cc8b564bb3 100755 --- a/scripts/create_release.py +++ b/scripts/create_release.py @@ -22,7 +22,7 @@ def version_key(version_string): def main(args): if subprocess.check_output(['git', 'status', '--porcelain'], cwd=root_dir).strip(): - print('tree is not clean') + print(f'tree is not clean{asdf}') # This is a bogus change sys.exit(1) From 21c3fc8d394e519d85ad131c639fe8794d98cca5 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Wed, 23 Aug 2023 15:50:52 -0700 Subject: [PATCH 03/16] try to get 3.8 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c4d2734a2b..272b2ae0b7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -60,8 +60,8 @@ jobs: 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 pip install flake8==3.8 + - run: python3 -m pip install flake8==3.8 - run: python2 -m flake8 --show-source --statistics - run: python3 -m flake8 --show-source --statistics test-linux: From 8bcd562a3593323c648f5f904d691b6a7f6ecc61 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Wed, 23 Aug 2023 16:36:10 -0700 Subject: [PATCH 04/16] extend-exclude --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 272b2ae0b7..8b1cc5ca87 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -62,7 +62,7 @@ jobs: - run: python3 -m pip install --upgrade pip - run: python2 -m pip install flake8==3.8 - run: python3 -m pip install flake8==3.8 - - run: python2 -m flake8 --show-source --statistics + - run: python2 -m flake8 --show-source --statistics --extend-exclude=scripts/ - run: python3 -m flake8 --show-source --statistics test-linux: executor: bionic From 02ff3e57f79b909111e9c8c63bdb2b2be0b40d66 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Wed, 23 Aug 2023 17:06:32 -0700 Subject: [PATCH 05/16] fix format --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8b1cc5ca87..829c7bfdc3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -62,7 +62,7 @@ jobs: - run: python3 -m pip install --upgrade pip - run: python2 -m pip install flake8==3.8 - run: python3 -m pip install flake8==3.8 - - run: python2 -m flake8 --show-source --statistics --extend-exclude=scripts/ + - run: python2 -m flake8 --show-source --statistics --extend-exclude=./scripts - run: python3 -m flake8 --show-source --statistics test-linux: executor: bionic From 54dcf3dbc25a470a863e86b18e573115b9251f77 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Wed, 23 Aug 2023 17:08:37 -0700 Subject: [PATCH 06/16] does it even do anything --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 829c7bfdc3..cb732f8636 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -62,7 +62,7 @@ jobs: - run: python3 -m pip install --upgrade pip - run: python2 -m pip install flake8==3.8 - run: python3 -m pip install flake8==3.8 - - run: python2 -m flake8 --show-source --statistics --extend-exclude=./scripts + - run: python2 -m flake8 --show-source --statistics --extend-excludeeee=./scripts - run: python3 -m flake8 --show-source --statistics test-linux: executor: bionic From 497c50568d3aeba479645cbba5716b70e122483f Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Wed, 23 Aug 2023 17:10:20 -0700 Subject: [PATCH 07/16] try configfile --- .circleci/config.yml | 2 +- .flake8 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cb732f8636..829c7bfdc3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -62,7 +62,7 @@ jobs: - run: python3 -m pip install --upgrade pip - run: python2 -m pip install flake8==3.8 - run: python3 -m pip install flake8==3.8 - - run: python2 -m flake8 --show-source --statistics --extend-excludeeee=./scripts + - 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 4a0ec27194..0361901972 100644 --- a/.flake8 +++ b/.flake8 @@ -21,3 +21,4 @@ exclude = ./temp ./downloads ./crunch + ./scripts \ No newline at end of file From 4e1723d88a624b006c31dfcc7c45ca2c4a2983a5 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Wed, 23 Aug 2023 17:15:13 -0700 Subject: [PATCH 08/16] no 741 --- .flake8 | 1 + 1 file changed, 1 insertion(+) diff --git a/.flake8 b/.flake8 index 0361901972..c0dd899096 100644 --- a/.flake8 +++ b/.flake8 @@ -5,6 +5,7 @@ ignore = 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 From d7c09a6c32f6849f59f63ec87af467e439aed9f1 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Wed, 23 Aug 2023 17:16:52 -0700 Subject: [PATCH 09/16] no config --- .flake8 | 1 - 1 file changed, 1 deletion(-) diff --git a/.flake8 b/.flake8 index c0dd899096..fd12855fb8 100644 --- a/.flake8 +++ b/.flake8 @@ -22,4 +22,3 @@ exclude = ./temp ./downloads ./crunch - ./scripts \ No newline at end of file From f4e8a03263fed71bca6204837844c7c1fe8e214e Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Wed, 23 Aug 2023 17:18:55 -0700 Subject: [PATCH 10/16] try --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 829c7bfdc3..8f7f86afc4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -62,7 +62,7 @@ jobs: - run: python3 -m pip install --upgrade pip - run: python2 -m pip install flake8==3.8 - run: python3 -m pip install flake8==3.8 - - run: python2 -m flake8 --show-source --statistics --extend-exclude=./scripts + - run: python2 -m flake8 --show-source --statistics --extend-exclude=./scripts/ - run: python3 -m flake8 --show-source --statistics test-linux: executor: bionic From e3fabd1218d16759681f865a70c05c069599a046 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Wed, 23 Aug 2023 17:21:30 -0700 Subject: [PATCH 11/16] try 4.0 --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8f7f86afc4..2c7cb71561 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -60,9 +60,9 @@ jobs: 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.8 - - run: python3 -m pip install flake8==3.8 - - run: python2 -m flake8 --show-source --statistics --extend-exclude=./scripts/ + - run: python2 -m pip install flake8==4.0 + - run: python3 -m pip install flake8==4.0 + - run: python2 -m flake8 --show-source --statistics --extend-exclude=./scripts - run: python3 -m flake8 --show-source --statistics test-linux: executor: bionic From 8d2841f8fe0cb020120ef9e382018ccb8bee7e94 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Wed, 23 Aug 2023 17:23:27 -0700 Subject: [PATCH 12/16] try 3.9.2 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2c7cb71561..bc573c1503 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -60,8 +60,8 @@ jobs: 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==4.0 - - run: python3 -m pip install flake8==4.0 + - 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: From cbee671e99f2e598da39818bb2afa20607998185 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Wed, 23 Aug 2023 17:27:53 -0700 Subject: [PATCH 13/16] try pattern --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bc573c1503..c33d7d0fa4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -62,7 +62,7 @@ jobs: - run: python3 -m pip install --upgrade pip - 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: python2 -m flake8 --show-source --statistics --extend-exclude=update*.py - run: python3 -m flake8 --show-source --statistics test-linux: executor: bionic From 7d500920517e6b89ddfef72630629dab5104069e Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Wed, 23 Aug 2023 17:31:10 -0700 Subject: [PATCH 14/16] try exclude --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c33d7d0fa4..020abc992a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -62,7 +62,7 @@ jobs: - run: python3 -m pip install --upgrade pip - 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=update*.py + - run: python2 -m flake8 --show-source --statistics --exclude=./scripts - run: python3 -m flake8 --show-source --statistics test-linux: executor: bionic From 598c190ea592ad99d9e3ea75c7a2f92e268c41ff Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Wed, 23 Aug 2023 17:33:30 -0700 Subject: [PATCH 15/16] fix file syntax --- .circleci/config.yml | 2 +- .flake8 | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 020abc992a..bc573c1503 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -62,7 +62,7 @@ jobs: - run: python3 -m pip install --upgrade pip - 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 --exclude=./scripts + - 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 fd12855fb8..e49d748821 100644 --- a/.flake8 +++ b/.flake8 @@ -7,18 +7,18 @@ ignore = 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, From b2ed3baa1beaf751c33a8d3a14b652199b2e2364 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Wed, 23 Aug 2023 17:37:35 -0700 Subject: [PATCH 16/16] remove error --- scripts/create_release.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/create_release.py b/scripts/create_release.py index cc8b564bb3..418dcabae0 100755 --- a/scripts/create_release.py +++ b/scripts/create_release.py @@ -22,8 +22,7 @@ def version_key(version_string): def main(args): if subprocess.check_output(['git', 'status', '--porcelain'], cwd=root_dir).strip(): - print(f'tree is not clean{asdf}') - # This is a bogus change + print('tree is not clean') sys.exit(1) release_info = emsdk.load_releases_info()