Commit 0093ec8

Browse files
cclaussgengjiawen
cclauss
authored and
gengjiawen
committed
gyp: Improve our flake8 linting tests
PR-URL: #2356 Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
1 parent 06ddde2 commit 0093ec8

4 files changed

Lines changed: 48 additions & 51 deletions

File tree

‎.github/workflows/tests.yml‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# TODO: Line 47, enable pytest --doctest-modules
1+
# TODO: Line 43, enable pytest --doctest-modules
22

33
name: Tests
44
on: [push, pull_request]
@@ -36,16 +36,10 @@ jobs:
3636
echo 'GYP_MSVS_OVERRIDE_PATH=C:\\Dummy' >> $Env:GITHUB_ENV
3737
- name: Lint Python
3838
if: matrix.os == 'ubuntu-latest'
39-
run: |
40-
# stop the build if there are Python syntax errors or undefined names
41-
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
42-
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
43-
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
39+
run: flake8 . --ignore=E203,W503 --max-complexity=101 --max-line-length=88 --show-source --statistics
4440
- name: Run Python tests
45-
run: |
46-
python -m pytest
41+
run: python -m pytest
4742
# - name: Run doctests with pytest
4843
# run: python -m pytest --doctest-modules
4944
- name: Run Node tests
50-
run: |
51-
npm test
45+
run: npm test

‎gyp/pylib/gyp/generator/msvs.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3276,9 +3276,9 @@ def GetEdges(node):
32763276
# append to the default value. I.e. PATH=$(PATH);other_path
32773277
edges.update(
32783278
{
3279-
v
3280-
forvinMSVS_VARIABLE_REFERENCE.findall(value)
3281-
ifvinpropertiesandv!=node
3279+
v
3280+
forvinMSVS_VARIABLE_REFERENCE.findall(value)
3281+
ifvinpropertiesandv!=node
32823282
}
32833283
)
32843284
returnedges

‎test/fixtures/test-charmap.py‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,30 @@
22
importlocale
33

44
try:
5-
reload(sys)
5+
reload(sys)
66
exceptNameError: # Python 3
7-
pass
7+
pass
8+
89

910
defmain():
10-
encoding=locale.getdefaultlocale()[1]
11-
ifnotencoding:
12-
returnFalse
11+
encoding=locale.getdefaultlocale()[1]
12+
ifnotencoding:
13+
returnFalse
1314

14-
try:
15-
sys.setdefaultencoding(encoding)
16-
exceptAttributeError: # Python 3
17-
pass
15+
try:
16+
sys.setdefaultencoding(encoding)
17+
exceptAttributeError: # Python 3
18+
pass
19+
20+
textmap= {
21+
"cp936": "\u4e2d\u6587",
22+
"cp1252": "Lat\u012Bna",
23+
"cp932": "\u306b\u307b\u3093\u3054",
24+
}
25+
ifencodingintextmap:
26+
print(textmap[encoding])
27+
returnTrue
1828

19-
textmap= {
20-
'cp936': '\u4e2d\u6587',
21-
'cp1252': 'Lat\u012Bna',
22-
'cp932': '\u306b\u307b\u3093\u3054'
23-
}
24-
ifencodingintextmap:
25-
print(textmap[encoding])
26-
returnTrue
2729

28-
if__name__=='__main__':
29-
print(main())
30+
if__name__=="__main__":
31+
print(main())

‎update-gyp.py‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
importos
55
importshutil
66
importsubprocess
7-
importsys
87
importtarfile
98
importtempfile
109
importurllib.request
1110

1211
BASE_URL="https://github.com/nodejs/gyp-next/archive/"
1312
CHECKOUT_PATH=os.path.dirname(os.path.realpath(__file__))
14-
CHECKOUT_GYP_PATH=os.path.join(CHECKOUT_PATH, 'gyp')
13+
CHECKOUT_GYP_PATH=os.path.join(CHECKOUT_PATH, "gyp")
1514

1615
parser=argparse.ArgumentParser()
1716
parser.add_argument("tag", help="gyp tag to update to")
@@ -21,25 +20,27 @@
2120

2221
changed_files=subprocess.check_output(["git", "diff", "--name-only"]).strip()
2322
ifchanged_files:
24-
raiseException("Can't update gyp while you have uncommitted changes in node-gyp")
23+
raiseException("Can't update gyp while you have uncommitted changes in node-gyp")
2524

2625
withtempfile.TemporaryDirectory() astmp_dir:
27-
tar_file=os.path.join(tmp_dir, 'gyp.tar.gz')
28-
unzip_target=os.path.join(tmp_dir, 'gyp')
29-
withopen(tar_file, 'wb') asf:
30-
print("Downloading gyp-next@"+args.tag+" into temporary directory...")
31-
print("From: "+tar_url)
32-
withurllib.request.urlopen(tar_url) asin_file:
33-
f.write(in_file.read())
34-
35-
print("Unzipping...")
36-
withtarfile.open(tar_file, "r:gz") astar_ref:
37-
tar_ref.extractall(unzip_target)
38-
39-
print("Moving to current checkout ("+CHECKOUT_PATH+")...")
40-
ifos.path.exists(CHECKOUT_GYP_PATH):
41-
shutil.rmtree(CHECKOUT_GYP_PATH)
42-
shutil.move(os.path.join(unzip_target, os.listdir(unzip_target)[0]), CHECKOUT_GYP_PATH)
26+
tar_file=os.path.join(tmp_dir, "gyp.tar.gz")
27+
unzip_target=os.path.join(tmp_dir, "gyp")
28+
withopen(tar_file, "wb") asf:
29+
print("Downloading gyp-next@"+args.tag+" into temporary directory...")
30+
print("From: "+tar_url)
31+
withurllib.request.urlopen(tar_url) asin_file:
32+
f.write(in_file.read())
33+
34+
print("Unzipping...")
35+
withtarfile.open(tar_file, "r:gz") astar_ref:
36+
tar_ref.extractall(unzip_target)
37+
38+
print("Moving to current checkout ("+CHECKOUT_PATH+")...")
39+
ifos.path.exists(CHECKOUT_GYP_PATH):
40+
shutil.rmtree(CHECKOUT_GYP_PATH)
41+
shutil.move(
42+
os.path.join(unzip_target, os.listdir(unzip_target)[0]), CHECKOUT_GYP_PATH
43+
)
4344

4445
subprocess.check_output(["git", "add", "gyp"], cwd=CHECKOUT_PATH)
4546
subprocess.check_output(["git", "commit", "-m", "gyp: update gyp to "+args.tag])

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit 0093ec8
Browse files
cclaussgengjiawen
cclauss
authored and
gengjiawen
committed
gyp: Improve our flake8 linting tests
PR-URL: #2356
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
1 parent 06ddde2 commit 0093ec8
4 files changed
Lines changed: 48 additions & 51 deletions
File tree
‎.github/workflows/tests.yml‎
Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# TODO: Line 47, enable pytest --doctest-modules
1+
# TODO: Line 43, enable pytest --doctest-modules
22

33
name: Tests
44
on: [push, pull_request]
@@ -36,16 +36,10 @@ jobs:
3636
 echo 'GYP_MSVS_OVERRIDE_PATH=C:\\Dummy' >> $Env:GITHUB_ENV
3737
 - name: Lint Python
3838
if: matrix.os == 'ubuntu-latest'
39-
run: |
40-
 # stop the build if there are Python syntax errors or undefined names
41-
 flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
42-
 # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
43-
 flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
39+
run: flake8 . --ignore=E203,W503 --max-complexity=101 --max-line-length=88 --show-source --statistics
4440
 - name: Run Python tests
45-
run: |
46-
 python -m pytest
41+
run: python -m pytest
4742
# - name: Run doctests with pytest
4843
# run: python -m pytest --doctest-modules
4944
 - name: Run Node tests
50-
run: |
51-
 npm test
45+
run: npm test
‎gyp/pylib/gyp/generator/msvs.py‎
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3276,9 +3276,9 @@ def GetEdges(node):
32763276
# append to the default value. I.e. PATH=$(PATH);other_path
32773277
edges.update(
32783278
 {
3279-
v
3280-
forvinMSVS_VARIABLE_REFERENCE.findall(value)
3281-
ifvinpropertiesandv!=node
3279+
v
3280+
forvinMSVS_VARIABLE_REFERENCE.findall(value)
3281+
ifvinpropertiesandv!=node
32823282
 }
32833283
 )
32843284
returnedges
‎test/fixtures/test-charmap.py‎
Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,30 @@
22
importlocale
33

44
try:
5-
reload(sys)
5+
reload(sys)
66
exceptNameError: # Python 3
7-
pass
7+
pass
8+
89

910
defmain():
10-
encoding=locale.getdefaultlocale()[1]
11-
ifnotencoding:
12-
returnFalse
11+
encoding=locale.getdefaultlocale()[1]
12+
ifnotencoding:
13+
returnFalse
1314

14-
try:
15-
sys.setdefaultencoding(encoding)
16-
exceptAttributeError: # Python 3
17-
pass
15+
try:
16+
sys.setdefaultencoding(encoding)
17+
exceptAttributeError: # Python 3
18+
pass
19+
20+
textmap= {
21+
"cp936": "\u4e2d\u6587",
22+
"cp1252": "Lat\u012Bna",
23+
"cp932": "\u306b\u307b\u3093\u3054",
24+
 }
25+
ifencodingintextmap:
26+
print(textmap[encoding])
27+
returnTrue
1828

19-
textmap= {
20-
'cp936': '\u4e2d\u6587',
21-
'cp1252': 'Lat\u012Bna',
22-
'cp932': '\u306b\u307b\u3093\u3054'
23-
 }
24-
ifencodingintextmap:
25-
print(textmap[encoding])
26-
returnTrue
2729

28-
if__name__=='__main__':
29-
print(main())
30+
if__name__=="__main__":
31+
print(main())
‎update-gyp.py‎
Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
importos
55
importshutil
66
importsubprocess
7-
importsys
87
importtarfile
98
importtempfile
109
importurllib.request
1110

1211
BASE_URL="https://github.com/nodejs/gyp-next/archive/"
1312
CHECKOUT_PATH=os.path.dirname(os.path.realpath(__file__))
14-
CHECKOUT_GYP_PATH=os.path.join(CHECKOUT_PATH, 'gyp')
13+
CHECKOUT_GYP_PATH=os.path.join(CHECKOUT_PATH, "gyp")
1514

1615
parser=argparse.ArgumentParser()
1716
parser.add_argument("tag", help="gyp tag to update to")
@@ -21,25 +20,27 @@
2120

2221
changed_files=subprocess.check_output(["git", "diff", "--name-only"]).strip()
2322
ifchanged_files:
24-
raiseException("Can't update gyp while you have uncommitted changes in node-gyp")
23+
raiseException("Can't update gyp while you have uncommitted changes in node-gyp")
2524

2625
withtempfile.TemporaryDirectory() astmp_dir:
27-
tar_file=os.path.join(tmp_dir, 'gyp.tar.gz')
28-
unzip_target=os.path.join(tmp_dir, 'gyp')
29-
withopen(tar_file, 'wb') asf:
30-
print("Downloading gyp-next@"+args.tag+" into temporary directory...")
31-
print("From: "+tar_url)
32-
withurllib.request.urlopen(tar_url) asin_file:
33-
f.write(in_file.read())
34-
35-
print("Unzipping...")
36-
withtarfile.open(tar_file, "r:gz") astar_ref:
37-
tar_ref.extractall(unzip_target)
38-
39-
print("Moving to current checkout ("+CHECKOUT_PATH+")...")
40-
ifos.path.exists(CHECKOUT_GYP_PATH):
41-
shutil.rmtree(CHECKOUT_GYP_PATH)
42-
shutil.move(os.path.join(unzip_target, os.listdir(unzip_target)[0]), CHECKOUT_GYP_PATH)
26+
tar_file=os.path.join(tmp_dir, "gyp.tar.gz")
27+
unzip_target=os.path.join(tmp_dir, "gyp")
28+
withopen(tar_file, "wb") asf:
29+
print("Downloading gyp-next@"+args.tag+" into temporary directory...")
30+
print("From: "+tar_url)
31+
withurllib.request.urlopen(tar_url) asin_file:
32+
f.write(in_file.read())
33+
34+
print("Unzipping...")
35+
withtarfile.open(tar_file, "r:gz") astar_ref:
36+
tar_ref.extractall(unzip_target)
37+
38+
print("Moving to current checkout ("+CHECKOUT_PATH+")...")
39+
ifos.path.exists(CHECKOUT_GYP_PATH):
40+
shutil.rmtree(CHECKOUT_GYP_PATH)
41+
shutil.move(
42+
os.path.join(unzip_target, os.listdir(unzip_target)[0]), CHECKOUT_GYP_PATH
43+
 )
4344

4445
subprocess.check_output(["git", "add", "gyp"], cwd=CHECKOUT_PATH)
4546
subprocess.check_output(["git", "commit", "-m", "gyp: update gyp to "+args.tag])
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 0093ec8
Browse files
cclaussgengjiawen
cclauss
authored and
gengjiawen
committed
gyp: Improve our flake8 linting tests
PR-URL: #2356
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
1 parent 06ddde2 commit 0093ec8
4 files changed
Lines changed: 48 additions & 51 deletions
File tree
‎.github/workflows/tests.yml‎
Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# TODO: Line 47, enable pytest --doctest-modules
1+
# TODO: Line 43, enable pytest --doctest-modules
22

33
name: Tests
44
on: [push, pull_request]
@@ -36,16 +36,10 @@ jobs:
3636
 echo 'GYP_MSVS_OVERRIDE_PATH=C:\\Dummy' >> $Env:GITHUB_ENV
3737
 - name: Lint Python
3838
if: matrix.os == 'ubuntu-latest'
39-
run: |
40-
 # stop the build if there are Python syntax errors or undefined names
41-
 flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
42-
 # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
43-
 flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
39+
run: flake8 . --ignore=E203,W503 --max-complexity=101 --max-line-length=88 --show-source --statistics
4440
 - name: Run Python tests
45-
run: |
46-
 python -m pytest
41+
run: python -m pytest
4742
# - name: Run doctests with pytest
4843
# run: python -m pytest --doctest-modules
4944
 - name: Run Node tests
50-
run: |
51-
 npm test
45+
run: npm test
‎gyp/pylib/gyp/generator/msvs.py‎
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3276,9 +3276,9 @@ def GetEdges(node):
32763276
# append to the default value. I.e. PATH=$(PATH);other_path
32773277
edges.update(
32783278
 {
3279-
v
3280-
forvinMSVS_VARIABLE_REFERENCE.findall(value)
3281-
ifvinpropertiesandv!=node
3279+
v
3280+
forvinMSVS_VARIABLE_REFERENCE.findall(value)
3281+
ifvinpropertiesandv!=node
32823282
 }
32833283
 )
32843284
returnedges
‎test/fixtures/test-charmap.py‎
Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,30 @@
22
importlocale
33

44
try:
5-
reload(sys)
5+
reload(sys)
66
exceptNameError: # Python 3
7-
pass
7+
pass
8+
89

910
defmain():
10-
encoding=locale.getdefaultlocale()[1]
11-
ifnotencoding:
12-
returnFalse
11+
encoding=locale.getdefaultlocale()[1]
12+
ifnotencoding:
13+
returnFalse
1314

14-
try:
15-
sys.setdefaultencoding(encoding)
16-
exceptAttributeError: # Python 3
17-
pass
15+
try:
16+
sys.setdefaultencoding(encoding)
17+
exceptAttributeError: # Python 3
18+
pass
19+
20+
textmap= {
21+
"cp936": "\u4e2d\u6587",
22+
"cp1252": "Lat\u012Bna",
23+
"cp932": "\u306b\u307b\u3093\u3054",
24+
 }
25+
ifencodingintextmap:
26+
print(textmap[encoding])
27+
returnTrue
1828

19-
textmap= {
20-
'cp936': '\u4e2d\u6587',
21-
'cp1252': 'Lat\u012Bna',
22-
'cp932': '\u306b\u307b\u3093\u3054'
23-
 }
24-
ifencodingintextmap:
25-
print(textmap[encoding])
26-
returnTrue
2729

28-
if__name__=='__main__':
29-
print(main())
30+
if__name__=="__main__":
31+
print(main())
‎update-gyp.py‎
Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
importos
55
importshutil
66
importsubprocess
7-
importsys
87
importtarfile
98
importtempfile
109
importurllib.request
1110

1211
BASE_URL="https://github.com/nodejs/gyp-next/archive/"
1312
CHECKOUT_PATH=os.path.dirname(os.path.realpath(__file__))
14-
CHECKOUT_GYP_PATH=os.path.join(CHECKOUT_PATH, 'gyp')
13+
CHECKOUT_GYP_PATH=os.path.join(CHECKOUT_PATH, "gyp")
1514

1615
parser=argparse.ArgumentParser()
1716
parser.add_argument("tag", help="gyp tag to update to")
@@ -21,25 +20,27 @@
2120

2221
changed_files=subprocess.check_output(["git", "diff", "--name-only"]).strip()
2322
ifchanged_files:
24-
raiseException("Can't update gyp while you have uncommitted changes in node-gyp")
23+
raiseException("Can't update gyp while you have uncommitted changes in node-gyp")
2524

2625
withtempfile.TemporaryDirectory() astmp_dir:
27-
tar_file=os.path.join(tmp_dir, 'gyp.tar.gz')
28-
unzip_target=os.path.join(tmp_dir, 'gyp')
29-
withopen(tar_file, 'wb') asf:
30-
print("Downloading gyp-next@"+args.tag+" into temporary directory...")
31-
print("From: "+tar_url)
32-
withurllib.request.urlopen(tar_url) asin_file:
33-
f.write(in_file.read())
34-
35-
print("Unzipping...")
36-
withtarfile.open(tar_file, "r:gz") astar_ref:
37-
tar_ref.extractall(unzip_target)
38-
39-
print("Moving to current checkout ("+CHECKOUT_PATH+")...")
40-
ifos.path.exists(CHECKOUT_GYP_PATH):
41-
shutil.rmtree(CHECKOUT_GYP_PATH)
42-
shutil.move(os.path.join(unzip_target, os.listdir(unzip_target)[0]), CHECKOUT_GYP_PATH)
26+
tar_file=os.path.join(tmp_dir, "gyp.tar.gz")
27+
unzip_target=os.path.join(tmp_dir, "gyp")
28+
withopen(tar_file, "wb") asf:
29+
print("Downloading gyp-next@"+args.tag+" into temporary directory...")
30+
print("From: "+tar_url)
31+
withurllib.request.urlopen(tar_url) asin_file:
32+
f.write(in_file.read())
33+
34+
print("Unzipping...")
35+
withtarfile.open(tar_file, "r:gz") astar_ref:
36+
tar_ref.extractall(unzip_target)
37+
38+
print("Moving to current checkout ("+CHECKOUT_PATH+")...")
39+
ifos.path.exists(CHECKOUT_GYP_PATH):
40+
shutil.rmtree(CHECKOUT_GYP_PATH)
41+
shutil.move(
42+
os.path.join(unzip_target, os.listdir(unzip_target)[0]), CHECKOUT_GYP_PATH
43+
 )
4344

4445
subprocess.check_output(["git", "add", "gyp"], cwd=CHECKOUT_PATH)
4546
subprocess.check_output(["git", "commit", "-m", "gyp: update gyp to "+args.tag])
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 0093ec8
Browse files
cclaussgengjiawen
cclauss
authored and
gengjiawen
committed
gyp: Improve our flake8 linting tests
PR-URL: #2356
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
1 parent 06ddde2 commit 0093ec8
4 files changed
Lines changed: 48 additions & 51 deletions
File tree
‎.github/workflows/tests.yml‎
Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# TODO: Line 47, enable pytest --doctest-modules
1+
# TODO: Line 43, enable pytest --doctest-modules
22

33
name: Tests
44
on: [push, pull_request]
@@ -36,16 +36,10 @@ jobs:
3636
 echo 'GYP_MSVS_OVERRIDE_PATH=C:\\Dummy' >> $Env:GITHUB_ENV
3737
 - name: Lint Python
3838
if: matrix.os == 'ubuntu-latest'
39-
run: |
40-
 # stop the build if there are Python syntax errors or undefined names
41-
 flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
42-
 # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
43-
 flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
39+
run: flake8 . --ignore=E203,W503 --max-complexity=101 --max-line-length=88 --show-source --statistics
4440
 - name: Run Python tests
45-
run: |
46-
 python -m pytest
41+
run: python -m pytest
4742
# - name: Run doctests with pytest
4843
# run: python -m pytest --doctest-modules
4944
 - name: Run Node tests
50-
run: |
51-
 npm test
45+
run: npm test
‎gyp/pylib/gyp/generator/msvs.py‎
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3276,9 +3276,9 @@ def GetEdges(node):
32763276
# append to the default value. I.e. PATH=$(PATH);other_path
32773277
edges.update(
32783278
 {
3279-
v
3280-
forvinMSVS_VARIABLE_REFERENCE.findall(value)
3281-
ifvinpropertiesandv!=node
3279+
v
3280+
forvinMSVS_VARIABLE_REFERENCE.findall(value)
3281+
ifvinpropertiesandv!=node
32823282
 }
32833283
 )
32843284
returnedges
‎test/fixtures/test-charmap.py‎
Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,30 @@
22
importlocale
33

44
try:
5-
reload(sys)
5+
reload(sys)
66
exceptNameError: # Python 3
7-
pass
7+
pass
8+
89

910
defmain():
10-
encoding=locale.getdefaultlocale()[1]
11-
ifnotencoding:
12-
returnFalse
11+
encoding=locale.getdefaultlocale()[1]
12+
ifnotencoding:
13+
returnFalse
1314

14-
try:
15-
sys.setdefaultencoding(encoding)
16-
exceptAttributeError: # Python 3
17-
pass
15+
try:
16+
sys.setdefaultencoding(encoding)
17+
exceptAttributeError: # Python 3
18+
pass
19+
20+
textmap= {
21+
"cp936": "\u4e2d\u6587",
22+
"cp1252": "Lat\u012Bna",
23+
"cp932": "\u306b\u307b\u3093\u3054",
24+
 }
25+
ifencodingintextmap:
26+
print(textmap[encoding])
27+
returnTrue
1828

19-
textmap= {
20-
'cp936': '\u4e2d\u6587',
21-
'cp1252': 'Lat\u012Bna',
22-
'cp932': '\u306b\u307b\u3093\u3054'
23-
 }
24-
ifencodingintextmap:
25-
print(textmap[encoding])
26-
returnTrue
2729

28-
if__name__=='__main__':
29-
print(main())
30+
if__name__=="__main__":
31+
print(main())
‎update-gyp.py‎
Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
importos
55
importshutil
66
importsubprocess
7-
importsys
87
importtarfile
98
importtempfile
109
importurllib.request
1110

1211
BASE_URL="https://github.com/nodejs/gyp-next/archive/"
1312
CHECKOUT_PATH=os.path.dirname(os.path.realpath(__file__))
14-
CHECKOUT_GYP_PATH=os.path.join(CHECKOUT_PATH, 'gyp')
13+
CHECKOUT_GYP_PATH=os.path.join(CHECKOUT_PATH, "gyp")
1514

1615
parser=argparse.ArgumentParser()
1716
parser.add_argument("tag", help="gyp tag to update to")
@@ -21,25 +20,27 @@
2120

2221
changed_files=subprocess.check_output(["git", "diff", "--name-only"]).strip()
2322
ifchanged_files:
24-
raiseException("Can't update gyp while you have uncommitted changes in node-gyp")
23+
raiseException("Can't update gyp while you have uncommitted changes in node-gyp")
2524

2625
withtempfile.TemporaryDirectory() astmp_dir:
27-
tar_file=os.path.join(tmp_dir, 'gyp.tar.gz')
28-
unzip_target=os.path.join(tmp_dir, 'gyp')
29-
withopen(tar_file, 'wb') asf:
30-
print("Downloading gyp-next@"+args.tag+" into temporary directory...")
31-
print("From: "+tar_url)
32-
withurllib.request.urlopen(tar_url) asin_file:
33-
f.write(in_file.read())
34-
35-
print("Unzipping...")
36-
withtarfile.open(tar_file, "r:gz") astar_ref:
37-
tar_ref.extractall(unzip_target)
38-
39-
print("Moving to current checkout ("+CHECKOUT_PATH+")...")
40-
ifos.path.exists(CHECKOUT_GYP_PATH):
41-
shutil.rmtree(CHECKOUT_GYP_PATH)
42-
shutil.move(os.path.join(unzip_target, os.listdir(unzip_target)[0]), CHECKOUT_GYP_PATH)
26+
tar_file=os.path.join(tmp_dir, "gyp.tar.gz")
27+
unzip_target=os.path.join(tmp_dir, "gyp")
28+
withopen(tar_file, "wb") asf:
29+
print("Downloading gyp-next@"+args.tag+" into temporary directory...")
30+
print("From: "+tar_url)
31+
withurllib.request.urlopen(tar_url) asin_file:
32+
f.write(in_file.read())
33+
34+
print("Unzipping...")
35+
withtarfile.open(tar_file, "r:gz") astar_ref:
36+
tar_ref.extractall(unzip_target)
37+
38+
print("Moving to current checkout ("+CHECKOUT_PATH+")...")
39+
ifos.path.exists(CHECKOUT_GYP_PATH):
40+
shutil.rmtree(CHECKOUT_GYP_PATH)
41+
shutil.move(
42+
os.path.join(unzip_target, os.listdir(unzip_target)[0]), CHECKOUT_GYP_PATH
43+
 )
4344

4445
subprocess.check_output(["git", "add", "gyp"], cwd=CHECKOUT_PATH)
4546
subprocess.check_output(["git", "commit", "-m", "gyp: update gyp to "+args.tag])
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit 0093ec8
Browse files
cclaussgengjiawen
cclauss
authored and
gengjiawen
committed
gyp: Improve our flake8 linting tests
PR-URL: #2356
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
1 parent 06ddde2 commit 0093ec8
4 files changed
Lines changed: 48 additions & 51 deletions
File tree
‎.github/workflows/tests.yml‎
Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# TODO: Line 47, enable pytest --doctest-modules
1+
# TODO: Line 43, enable pytest --doctest-modules
22

33
name: Tests
44
on: [push, pull_request]
@@ -36,16 +36,10 @@ jobs:
3636
 echo 'GYP_MSVS_OVERRIDE_PATH=C:\\Dummy' >> $Env:GITHUB_ENV
3737
 - name: Lint Python
3838
if: matrix.os == 'ubuntu-latest'
39-
run: |
40-
 # stop the build if there are Python syntax errors or undefined names
41-
 flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
42-
 # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
43-
 flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
39+
run: flake8 . --ignore=E203,W503 --max-complexity=101 --max-line-length=88 --show-source --statistics
4440
 - name: Run Python tests
45-
run: |
46-
 python -m pytest
41+
run: python -m pytest
4742
# - name: Run doctests with pytest
4843
# run: python -m pytest --doctest-modules
4944
 - name: Run Node tests
50-
run: |
51-
 npm test
45+
run: npm test
‎gyp/pylib/gyp/generator/msvs.py‎
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3276,9 +3276,9 @@ def GetEdges(node):
32763276
# append to the default value. I.e. PATH=$(PATH);other_path
32773277
edges.update(
32783278
 {
3279-
v
3280-
forvinMSVS_VARIABLE_REFERENCE.findall(value)
3281-
ifvinpropertiesandv!=node
3279+
v
3280+
forvinMSVS_VARIABLE_REFERENCE.findall(value)
3281+
ifvinpropertiesandv!=node
32823282
 }
32833283
 )
32843284
returnedges
‎test/fixtures/test-charmap.py‎
Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,30 @@
22
importlocale
33

44
try:
5-
reload(sys)
5+
reload(sys)
66
exceptNameError: # Python 3
7-
pass
7+
pass
8+
89

910
defmain():
10-
encoding=locale.getdefaultlocale()[1]
11-
ifnotencoding:
12-
returnFalse
11+
encoding=locale.getdefaultlocale()[1]
12+
ifnotencoding:
13+
returnFalse
1314

14-
try:
15-
sys.setdefaultencoding(encoding)
16-
exceptAttributeError: # Python 3
17-
pass
15+
try:
16+
sys.setdefaultencoding(encoding)
17+
exceptAttributeError: # Python 3
18+
pass
19+
20+
textmap= {
21+
"cp936": "\u4e2d\u6587",
22+
"cp1252": "Lat\u012Bna",
23+
"cp932": "\u306b\u307b\u3093\u3054",
24+
 }
25+
ifencodingintextmap:
26+
print(textmap[encoding])
27+
returnTrue
1828

19-
textmap= {
20-
'cp936': '\u4e2d\u6587',
21-
'cp1252': 'Lat\u012Bna',
22-
'cp932': '\u306b\u307b\u3093\u3054'
23-
 }
24-
ifencodingintextmap:
25-
print(textmap[encoding])
26-
returnTrue
2729

28-
if__name__=='__main__':
29-
print(main())
30+
if__name__=="__main__":
31+
print(main())
‎update-gyp.py‎
Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
importos
55
importshutil
66
importsubprocess
7-
importsys
87
importtarfile
98
importtempfile
109
importurllib.request
1110

1211
BASE_URL="https://github.com/nodejs/gyp-next/archive/"
1312
CHECKOUT_PATH=os.path.dirname(os.path.realpath(__file__))
14-
CHECKOUT_GYP_PATH=os.path.join(CHECKOUT_PATH, 'gyp')
13+
CHECKOUT_GYP_PATH=os.path.join(CHECKOUT_PATH, "gyp")
1514

1615
parser=argparse.ArgumentParser()
1716
parser.add_argument("tag", help="gyp tag to update to")
@@ -21,25 +20,27 @@
2120

2221
changed_files=subprocess.check_output(["git", "diff", "--name-only"]).strip()
2322
ifchanged_files:
24-
raiseException("Can't update gyp while you have uncommitted changes in node-gyp")
23+
raiseException("Can't update gyp while you have uncommitted changes in node-gyp")
2524

2625
withtempfile.TemporaryDirectory() astmp_dir:
27-
tar_file=os.path.join(tmp_dir, 'gyp.tar.gz')
28-
unzip_target=os.path.join(tmp_dir, 'gyp')
29-
withopen(tar_file, 'wb') asf:
30-
print("Downloading gyp-next@"+args.tag+" into temporary directory...")
31-
print("From: "+tar_url)
32-
withurllib.request.urlopen(tar_url) asin_file:
33-
f.write(in_file.read())
34-
35-
print("Unzipping...")
36-
withtarfile.open(tar_file, "r:gz") astar_ref:
37-
tar_ref.extractall(unzip_target)
38-
39-
print("Moving to current checkout ("+CHECKOUT_PATH+")...")
40-
ifos.path.exists(CHECKOUT_GYP_PATH):
41-
shutil.rmtree(CHECKOUT_GYP_PATH)
42-
shutil.move(os.path.join(unzip_target, os.listdir(unzip_target)[0]), CHECKOUT_GYP_PATH)
26+
tar_file=os.path.join(tmp_dir, "gyp.tar.gz")
27+
unzip_target=os.path.join(tmp_dir, "gyp")
28+
withopen(tar_file, "wb") asf:
29+
print("Downloading gyp-next@"+args.tag+" into temporary directory...")
30+
print("From: "+tar_url)
31+
withurllib.request.urlopen(tar_url) asin_file:
32+
f.write(in_file.read())
33+
34+
print("Unzipping...")
35+
withtarfile.open(tar_file, "r:gz") astar_ref:
36+
tar_ref.extractall(unzip_target)
37+
38+
print("Moving to current checkout ("+CHECKOUT_PATH+")...")
39+
ifos.path.exists(CHECKOUT_GYP_PATH):
40+
shutil.rmtree(CHECKOUT_GYP_PATH)
41+
shutil.move(
42+
os.path.join(unzip_target, os.listdir(unzip_target)[0]), CHECKOUT_GYP_PATH
43+
 )
4344

4445
subprocess.check_output(["git", "add", "gyp"], cwd=CHECKOUT_PATH)
4546
subprocess.check_output(["git", "commit", "-m", "gyp: update gyp to "+args.tag])
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 0093ec8
Browse files
cclaussgengjiawen
cclauss
authored and
gengjiawen
committed
gyp: Improve our flake8 linting tests
PR-URL: #2356
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
1 parent 06ddde2 commit 0093ec8
4 files changed
Lines changed: 48 additions & 51 deletions
File tree
‎.github/workflows/tests.yml‎
Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# TODO: Line 47, enable pytest --doctest-modules
1+
# TODO: Line 43, enable pytest --doctest-modules
22

33
name: Tests
44
on: [push, pull_request]
@@ -36,16 +36,10 @@ jobs:
3636
 echo 'GYP_MSVS_OVERRIDE_PATH=C:\\Dummy' >> $Env:GITHUB_ENV
3737
 - name: Lint Python
3838
if: matrix.os == 'ubuntu-latest'
39-
run: |
40-
 # stop the build if there are Python syntax errors or undefined names
41-
 flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
42-
 # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
43-
 flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
39+
run: flake8 . --ignore=E203,W503 --max-complexity=101 --max-line-length=88 --show-source --statistics
4440
 - name: Run Python tests
45-
run: |
46-
 python -m pytest
41+
run: python -m pytest
4742
# - name: Run doctests with pytest
4843
# run: python -m pytest --doctest-modules
4944
 - name: Run Node tests
50-
run: |
51-
 npm test
45+
run: npm test
‎gyp/pylib/gyp/generator/msvs.py‎
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3276,9 +3276,9 @@ def GetEdges(node):
32763276
# append to the default value. I.e. PATH=$(PATH);other_path
32773277
edges.update(
32783278
 {
3279-
v
3280-
forvinMSVS_VARIABLE_REFERENCE.findall(value)
3281-
ifvinpropertiesandv!=node
3279+
v
3280+
forvinMSVS_VARIABLE_REFERENCE.findall(value)
3281+
ifvinpropertiesandv!=node
32823282
 }
32833283
 )
32843284
returnedges
‎test/fixtures/test-charmap.py‎
Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,30 @@
22
importlocale
33

44
try:
5-
reload(sys)
5+
reload(sys)
66
exceptNameError: # Python 3
7-
pass
7+
pass
8+
89

910
defmain():
10-
encoding=locale.getdefaultlocale()[1]
11-
ifnotencoding:
12-
returnFalse
11+
encoding=locale.getdefaultlocale()[1]
12+
ifnotencoding:
13+
returnFalse
1314

14-
try:
15-
sys.setdefaultencoding(encoding)
16-
exceptAttributeError: # Python 3
17-
pass
15+
try:
16+
sys.setdefaultencoding(encoding)
17+
exceptAttributeError: # Python 3
18+
pass
19+
20+
textmap= {
21+
"cp936": "\u4e2d\u6587",
22+
"cp1252": "Lat\u012Bna",
23+
"cp932": "\u306b\u307b\u3093\u3054",
24+
 }
25+
ifencodingintextmap:
26+
print(textmap[encoding])
27+
returnTrue
1828

19-
textmap= {
20-
'cp936': '\u4e2d\u6587',
21-
'cp1252': 'Lat\u012Bna',
22-
'cp932': '\u306b\u307b\u3093\u3054'
23-
 }
24-
ifencodingintextmap:
25-
print(textmap[encoding])
26-
returnTrue
2729

28-
if__name__=='__main__':
29-
print(main())
30+
if__name__=="__main__":
31+
print(main())
‎update-gyp.py‎
Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
importos
55
importshutil
66
importsubprocess
7-
importsys
87
importtarfile
98
importtempfile
109
importurllib.request
1110

1211
BASE_URL="https://github.com/nodejs/gyp-next/archive/"
1312
CHECKOUT_PATH=os.path.dirname(os.path.realpath(__file__))
14-
CHECKOUT_GYP_PATH=os.path.join(CHECKOUT_PATH, 'gyp')
13+
CHECKOUT_GYP_PATH=os.path.join(CHECKOUT_PATH, "gyp")
1514

1615
parser=argparse.ArgumentParser()
1716
parser.add_argument("tag", help="gyp tag to update to")
@@ -21,25 +20,27 @@
2120

2221
changed_files=subprocess.check_output(["git", "diff", "--name-only"]).strip()
2322
ifchanged_files:
24-
raiseException("Can't update gyp while you have uncommitted changes in node-gyp")
23+
raiseException("Can't update gyp while you have uncommitted changes in node-gyp")
2524

2625
withtempfile.TemporaryDirectory() astmp_dir:
27-
tar_file=os.path.join(tmp_dir, 'gyp.tar.gz')
28-
unzip_target=os.path.join(tmp_dir, 'gyp')
29-
withopen(tar_file, 'wb') asf:
30-
print("Downloading gyp-next@"+args.tag+" into temporary directory...")
31-
print("From: "+tar_url)
32-
withurllib.request.urlopen(tar_url) asin_file:
33-
f.write(in_file.read())
34-
35-
print("Unzipping...")
36-
withtarfile.open(tar_file, "r:gz") astar_ref:
37-
tar_ref.extractall(unzip_target)
38-
39-
print("Moving to current checkout ("+CHECKOUT_PATH+")...")
40-
ifos.path.exists(CHECKOUT_GYP_PATH):
41-
shutil.rmtree(CHECKOUT_GYP_PATH)
42-
shutil.move(os.path.join(unzip_target, os.listdir(unzip_target)[0]), CHECKOUT_GYP_PATH)
26+
tar_file=os.path.join(tmp_dir, "gyp.tar.gz")
27+
unzip_target=os.path.join(tmp_dir, "gyp")
28+
withopen(tar_file, "wb") asf:
29+
print("Downloading gyp-next@"+args.tag+" into temporary directory...")
30+
print("From: "+tar_url)
31+
withurllib.request.urlopen(tar_url) asin_file:
32+
f.write(in_file.read())
33+
34+
print("Unzipping...")
35+
withtarfile.open(tar_file, "r:gz") astar_ref:
36+
tar_ref.extractall(unzip_target)
37+
38+
print("Moving to current checkout ("+CHECKOUT_PATH+")...")
39+
ifos.path.exists(CHECKOUT_GYP_PATH):
40+
shutil.rmtree(CHECKOUT_GYP_PATH)
41+
shutil.move(
42+
os.path.join(unzip_target, os.listdir(unzip_target)[0]), CHECKOUT_GYP_PATH
43+
 )
4344

4445
subprocess.check_output(["git", "add", "gyp"], cwd=CHECKOUT_PATH)
4546
subprocess.check_output(["git", "commit", "-m", "gyp: update gyp to "+args.tag])
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 0093ec8
Browse files
cclaussgengjiawen
cclauss
authored and
gengjiawen
committed
gyp: Improve our flake8 linting tests
PR-URL: #2356
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
1 parent 06ddde2 commit 0093ec8
4 files changed
Lines changed: 48 additions & 51 deletions
File tree
‎.github/workflows/tests.yml‎
Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# TODO: Line 47, enable pytest --doctest-modules
1+
# TODO: Line 43, enable pytest --doctest-modules
22

33
name: Tests
44
on: [push, pull_request]
@@ -36,16 +36,10 @@ jobs:
3636
 echo 'GYP_MSVS_OVERRIDE_PATH=C:\\Dummy' >> $Env:GITHUB_ENV
3737
 - name: Lint Python
3838
if: matrix.os == 'ubuntu-latest'
39-
run: |
40-
 # stop the build if there are Python syntax errors or undefined names
41-
 flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
42-
 # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
43-
 flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
39+
run: flake8 . --ignore=E203,W503 --max-complexity=101 --max-line-length=88 --show-source --statistics
4440
 - name: Run Python tests
45-
run: |
46-
 python -m pytest
41+
run: python -m pytest
4742
# - name: Run doctests with pytest
4843
# run: python -m pytest --doctest-modules
4944
 - name: Run Node tests
50-
run: |
51-
 npm test
45+
run: npm test
‎gyp/pylib/gyp/generator/msvs.py‎
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3276,9 +3276,9 @@ def GetEdges(node):
32763276
# append to the default value. I.e. PATH=$(PATH);other_path
32773277
edges.update(
32783278
 {
3279-
v
3280-
forvinMSVS_VARIABLE_REFERENCE.findall(value)
3281-
ifvinpropertiesandv!=node
3279+
v
3280+
forvinMSVS_VARIABLE_REFERENCE.findall(value)
3281+
ifvinpropertiesandv!=node
32823282
 }
32833283
 )
32843284
returnedges
‎test/fixtures/test-charmap.py‎
Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,30 @@
22
importlocale
33

44
try:
5-
reload(sys)
5+
reload(sys)
66
exceptNameError: # Python 3
7-
pass
7+
pass
8+
89

910
defmain():
10-
encoding=locale.getdefaultlocale()[1]
11-
ifnotencoding:
12-
returnFalse
11+
encoding=locale.getdefaultlocale()[1]
12+
ifnotencoding:
13+
returnFalse
1314

14-
try:
15-
sys.setdefaultencoding(encoding)
16-
exceptAttributeError: # Python 3
17-
pass
15+
try:
16+
sys.setdefaultencoding(encoding)
17+
exceptAttributeError: # Python 3
18+
pass
19+
20+
textmap= {
21+
"cp936": "\u4e2d\u6587",
22+
"cp1252": "Lat\u012Bna",
23+
"cp932": "\u306b\u307b\u3093\u3054",
24+
 }
25+
ifencodingintextmap:
26+
print(textmap[encoding])
27+
returnTrue
1828

19-
textmap= {
20-
'cp936': '\u4e2d\u6587',
21-
'cp1252': 'Lat\u012Bna',
22-
'cp932': '\u306b\u307b\u3093\u3054'
23-
 }
24-
ifencodingintextmap:
25-
print(textmap[encoding])
26-
returnTrue
2729

28-
if__name__=='__main__':
29-
print(main())
30+
if__name__=="__main__":
31+
print(main())
‎update-gyp.py‎
Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
importos
55
importshutil
66
importsubprocess
7-
importsys
87
importtarfile
98
importtempfile
109
importurllib.request
1110

1211
BASE_URL="https://github.com/nodejs/gyp-next/archive/"
1312
CHECKOUT_PATH=os.path.dirname(os.path.realpath(__file__))
14-
CHECKOUT_GYP_PATH=os.path.join(CHECKOUT_PATH, 'gyp')
13+
CHECKOUT_GYP_PATH=os.path.join(CHECKOUT_PATH, "gyp")
1514

1615
parser=argparse.ArgumentParser()
1716
parser.add_argument("tag", help="gyp tag to update to")
@@ -21,25 +20,27 @@
2120

2221
changed_files=subprocess.check_output(["git", "diff", "--name-only"]).strip()
2322
ifchanged_files:
24-
raiseException("Can't update gyp while you have uncommitted changes in node-gyp")
23+
raiseException("Can't update gyp while you have uncommitted changes in node-gyp")
2524

2625
withtempfile.TemporaryDirectory() astmp_dir:
27-
tar_file=os.path.join(tmp_dir, 'gyp.tar.gz')
28-
unzip_target=os.path.join(tmp_dir, 'gyp')
29-
withopen(tar_file, 'wb') asf:
30-
print("Downloading gyp-next@"+args.tag+" into temporary directory...")
31-
print("From: "+tar_url)
32-
withurllib.request.urlopen(tar_url) asin_file:
33-
f.write(in_file.read())
34-
35-
print("Unzipping...")
36-
withtarfile.open(tar_file, "r:gz") astar_ref:
37-
tar_ref.extractall(unzip_target)
38-
39-
print("Moving to current checkout ("+CHECKOUT_PATH+")...")
40-
ifos.path.exists(CHECKOUT_GYP_PATH):
41-
shutil.rmtree(CHECKOUT_GYP_PATH)
42-
shutil.move(os.path.join(unzip_target, os.listdir(unzip_target)[0]), CHECKOUT_GYP_PATH)
26+
tar_file=os.path.join(tmp_dir, "gyp.tar.gz")
27+
unzip_target=os.path.join(tmp_dir, "gyp")
28+
withopen(tar_file, "wb") asf:
29+
print("Downloading gyp-next@"+args.tag+" into temporary directory...")
30+
print("From: "+tar_url)
31+
withurllib.request.urlopen(tar_url) asin_file:
32+
f.write(in_file.read())
33+
34+
print("Unzipping...")
35+
withtarfile.open(tar_file, "r:gz") astar_ref:
36+
tar_ref.extractall(unzip_target)
37+
38+
print("Moving to current checkout ("+CHECKOUT_PATH+")...")
39+
ifos.path.exists(CHECKOUT_GYP_PATH):
40+
shutil.rmtree(CHECKOUT_GYP_PATH)
41+
shutil.move(
42+
os.path.join(unzip_target, os.listdir(unzip_target)[0]), CHECKOUT_GYP_PATH
43+
 )
4344

4445
subprocess.check_output(["git", "add", "gyp"], cwd=CHECKOUT_PATH)
4546
subprocess.check_output(["git", "commit", "-m", "gyp: update gyp to "+args.tag])
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit 0093ec8
Browse files
cclaussgengjiawen
cclauss
authored and
gengjiawen
committed
gyp: Improve our flake8 linting tests
PR-URL: #2356
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
1 parent 06ddde2 commit 0093ec8
4 files changed
Lines changed: 48 additions & 51 deletions
File tree
‎.github/workflows/tests.yml‎
Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# TODO: Line 47, enable pytest --doctest-modules
1+
# TODO: Line 43, enable pytest --doctest-modules
22

33
name: Tests
44
on: [push, pull_request]
@@ -36,16 +36,10 @@ jobs:
3636
 echo 'GYP_MSVS_OVERRIDE_PATH=C:\\Dummy' >> $Env:GITHUB_ENV
3737
 - name: Lint Python
3838
if: matrix.os == 'ubuntu-latest'
39-
run: |
40-
 # stop the build if there are Python syntax errors or undefined names
41-
 flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
42-
 # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
43-
 flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
39+
run: flake8 . --ignore=E203,W503 --max-complexity=101 --max-line-length=88 --show-source --statistics
4440
 - name: Run Python tests
45-
run: |
46-
 python -m pytest
41+
run: python -m pytest
4742
# - name: Run doctests with pytest
4843
# run: python -m pytest --doctest-modules
4944
 - name: Run Node tests
50-
run: |
51-
 npm test
45+
run: npm test
‎gyp/pylib/gyp/generator/msvs.py‎
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3276,9 +3276,9 @@ def GetEdges(node):
32763276
# append to the default value. I.e. PATH=$(PATH);other_path
32773277
edges.update(
32783278
 {
3279-
v
3280-
forvinMSVS_VARIABLE_REFERENCE.findall(value)
3281-
ifvinpropertiesandv!=node
3279+
v
3280+
forvinMSVS_VARIABLE_REFERENCE.findall(value)
3281+
ifvinpropertiesandv!=node
32823282
 }
32833283
 )
32843284
returnedges
‎test/fixtures/test-charmap.py‎
Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,30 @@
22
importlocale
33

44
try:
5-
reload(sys)
5+
reload(sys)
66
exceptNameError: # Python 3
7-
pass
7+
pass
8+
89

910
defmain():
10-
encoding=locale.getdefaultlocale()[1]
11-
ifnotencoding:
12-
returnFalse
11+
encoding=locale.getdefaultlocale()[1]
12+
ifnotencoding:
13+
returnFalse
1314

14-
try:
15-
sys.setdefaultencoding(encoding)
16-
exceptAttributeError: # Python 3
17-
pass
15+
try:
16+
sys.setdefaultencoding(encoding)
17+
exceptAttributeError: # Python 3
18+
pass
19+
20+
textmap= {
21+
"cp936": "\u4e2d\u6587",
22+
"cp1252": "Lat\u012Bna",
23+
"cp932": "\u306b\u307b\u3093\u3054",
24+
 }
25+
ifencodingintextmap:
26+
print(textmap[encoding])
27+
returnTrue
1828

19-
textmap= {
20-
'cp936': '\u4e2d\u6587',
21-
'cp1252': 'Lat\u012Bna',
22-
'cp932': '\u306b\u307b\u3093\u3054'
23-
 }
24-
ifencodingintextmap:
25-
print(textmap[encoding])
26-
returnTrue
2729

28-
if__name__=='__main__':
29-
print(main())
30+
if__name__=="__main__":
31+
print(main())
‎update-gyp.py‎
Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
importos
55
importshutil
66
importsubprocess
7-
importsys
87
importtarfile
98
importtempfile
109
importurllib.request
1110

1211
BASE_URL="https://github.com/nodejs/gyp-next/archive/"
1312
CHECKOUT_PATH=os.path.dirname(os.path.realpath(__file__))
14-
CHECKOUT_GYP_PATH=os.path.join(CHECKOUT_PATH, 'gyp')
13+
CHECKOUT_GYP_PATH=os.path.join(CHECKOUT_PATH, "gyp")
1514

1615
parser=argparse.ArgumentParser()
1716
parser.add_argument("tag", help="gyp tag to update to")
@@ -21,25 +20,27 @@
2120

2221
changed_files=subprocess.check_output(["git", "diff", "--name-only"]).strip()
2322
ifchanged_files:
24-
raiseException("Can't update gyp while you have uncommitted changes in node-gyp")
23+
raiseException("Can't update gyp while you have uncommitted changes in node-gyp")
2524

2625
withtempfile.TemporaryDirectory() astmp_dir:
27-
tar_file=os.path.join(tmp_dir, 'gyp.tar.gz')
28-
unzip_target=os.path.join(tmp_dir, 'gyp')
29-
withopen(tar_file, 'wb') asf:
30-
print("Downloading gyp-next@"+args.tag+" into temporary directory...")
31-
print("From: "+tar_url)
32-
withurllib.request.urlopen(tar_url) asin_file:
33-
f.write(in_file.read())
34-
35-
print("Unzipping...")
36-
withtarfile.open(tar_file, "r:gz") astar_ref:
37-
tar_ref.extractall(unzip_target)
38-
39-
print("Moving to current checkout ("+CHECKOUT_PATH+")...")
40-
ifos.path.exists(CHECKOUT_GYP_PATH):
41-
shutil.rmtree(CHECKOUT_GYP_PATH)
42-
shutil.move(os.path.join(unzip_target, os.listdir(unzip_target)[0]), CHECKOUT_GYP_PATH)
26+
tar_file=os.path.join(tmp_dir, "gyp.tar.gz")
27+
unzip_target=os.path.join(tmp_dir, "gyp")
28+
withopen(tar_file, "wb") asf:
29+
print("Downloading gyp-next@"+args.tag+" into temporary directory...")
30+
print("From: "+tar_url)
31+
withurllib.request.urlopen(tar_url) asin_file:
32+
f.write(in_file.read())
33+
34+
print("Unzipping...")
35+
withtarfile.open(tar_file, "r:gz") astar_ref:
36+
tar_ref.extractall(unzip_target)
37+
38+
print("Moving to current checkout ("+CHECKOUT_PATH+")...")
39+
ifos.path.exists(CHECKOUT_GYP_PATH):
40+
shutil.rmtree(CHECKOUT_GYP_PATH)
41+
shutil.move(
42+
os.path.join(unzip_target, os.listdir(unzip_target)[0]), CHECKOUT_GYP_PATH
43+
 )
4344

4445
subprocess.check_output(["git", "add", "gyp"], cwd=CHECKOUT_PATH)
4546
subprocess.check_output(["git", "commit", "-m", "gyp: update gyp to "+args.tag])
0 commit comments
Comments
 (0)