Skip to content

Commit 7335b7f

Browse files
gracekarinagracekarina
authored
Merge branch 'master' into parser-resolving-duplicated-path
2 parents ebdcdcb + 1656aa9 commit 7335b7f

File tree

21 files changed

+84
-77
lines changed

21 files changed

+84
-77
lines changed

‎.github/workflows/next-snapshot-v1.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
with:
1717
app_id: ${{ secrets.APP_ID }}
1818
private_key: ${{ secrets.APP_PRIVATE_KEY }}
19-
- name: Set up Python 2.7
20-
uses: MatteoH2O1999/setup-python@v1
19+
- name: Set up Python 3.10
20+
uses: actions/setup-python@v4
2121
with:
22-
python-version: 2.7
22+
python-version: '3.10'
2323
- name: Set up Java 8
2424
uses: actions/setup-java@v2
2525
with:

‎.github/workflows/next-snapshot.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
with:
1717
app_id: ${{ secrets.APP_ID }}
1818
private_key: ${{ secrets.APP_PRIVATE_KEY }}
19-
- name: Set up Python 2.7
20-
uses: MatteoH2O1999/setup-python@v1
19+
- name: Set up Python 3.10
20+
uses: actions/setup-python@v4
2121
with:
22-
python-version: 2.7
22+
python-version: '3.10'
2323
- name: Set up Java 11
2424
uses: actions/setup-java@v2
2525
with:

‎.github/workflows/prepare-release-v1.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
with:
1717
app_id: ${{ secrets.APP_ID }}
1818
private_key: ${{ secrets.APP_PRIVATE_KEY }}
19-
- name: Set up Python 2.7
20-
uses: MatteoH2O1999/setup-python@v1
19+
- name: Set up Python 3.10
20+
uses: actions/setup-python@v4
2121
with:
22-
python-version: 2.7
22+
python-version: '3.10'
2323
- name: Set up Java 8
2424
uses: actions/setup-java@v2
2525
with:

‎.github/workflows/prepare-release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
with:
1717
app_id: ${{ secrets.APP_ID }}
1818
private_key: ${{ secrets.APP_PRIVATE_KEY }}
19-
- name: Set up Python 2.7
20-
uses: MatteoH2O1999/setup-python@v1
19+
- name: Set up Python 3.10
20+
uses: actions/setup-python@v4
2121
with:
22-
python-version: 2.7
22+
python-version: '3.10'
2323
- name: Set up Java 11
2424
uses: actions/setup-java@v2
2525
with:

‎.github/workflows/release-v1.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
with:
1717
app_id: ${{ secrets.APP_ID }}
1818
private_key: ${{ secrets.APP_PRIVATE_KEY }}
19-
- name: Set up Python 2.7
20-
uses: MatteoH2O1999/setup-python@v1
19+
- name: Set up Python 3.10
20+
uses: actions/setup-python@v4
2121
with:
22-
python-version: 2.7
22+
python-version: '3.10'
2323
- name: Set up Java 8
2424
uses: actions/setup-java@v2
2525
with:

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
with:
1717
app_id: ${{ secrets.APP_ID }}
1818
private_key: ${{ secrets.APP_PRIVATE_KEY }}
19-
- name: Set up Python 2.7
20-
uses: MatteoH2O1999/setup-python@v1
19+
- name: Set up Python 3.10
20+
uses: actions/setup-python@v4
2121
with:
22-
python-version: 2.7
22+
python-version: '3.10'
2323
- name: Set up Java 11
2424
uses: actions/setup-java@v2
2525
with:

‎CI/ghApiClient.py‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import os
44
import time
5-
import urllib2
6-
import httplib
5+
import urllib.request, urllib.error, urllib.parse
6+
import http.client
77
import json
88

99
GH_BASE_URL = "https://api.github.com/"
@@ -13,46 +13,47 @@
1313

1414
def readUrl(name):
1515
try:
16-
request = urllib2.Request(GH_BASE_URL + name)
16+
request = urllib.request.Request(GH_BASE_URL + name)
1717
request.add_header("Authorization", GH_AUTH)
18-
content = urllib2.urlopen(request).read()
18+
content = urllib.request.urlopen(request).read()
1919
jcont = json.loads(content)
20-
return jcont;
21-
except urllib2.HTTPError, e:
22-
print 'HTTPError = ' + str(e.code)
20+
return jcont
21+
except urllib.error.HTTPError as e:
22+
print(('HTTPError = ' + str(e.code)))
2323
raise e
24-
except urllib2.URLError, e:
25-
print 'URLError = ' + str(e.reason)
24+
except urllib.error.URLError as e:
25+
print(('URLError = ' + str(e.reason)))
2626
raise e
27-
except httplib.HTTPException, e:
28-
print 'HTTPException = ' + str(e)
27+
except http.client.HTTPException as e:
28+
print(('HTTPException = ' + str(e)))
2929
raise e
3030
except Exception:
3131
import traceback
32-
print 'generic exception: ' + traceback.format_exc()
32+
print(('generic exception: ' + traceback.format_exc()))
3333
raise IOError
3434

3535
def postUrl(name, body):
3636
global GH_BASE_URL
3737
try:
3838
time.sleep(0.05)
39-
request = urllib2.Request(GH_BASE_URL + name)
39+
request = urllib.request.Request(GH_BASE_URL + name)
4040
request.add_header("Authorization", GH_AUTH)
4141
request.add_header("Accept", "application/vnd.github.v3+json")
42-
content = urllib2.urlopen(request, body).read()
42+
data = body.encode('utf-8')
43+
content = urllib.request.urlopen(request, data).read()
4344
jcont = json.loads(content)
44-
return jcont;
45-
except urllib2.HTTPError, e:
46-
print 'HTTPError = ' + str(e.code)
47-
print str(e)
45+
return jcont
46+
except urllib.error.HTTPError as e:
47+
print(('HTTPError = ' + str(e.code)))
48+
print((str(e)))
4849
raise e
49-
except urllib2.URLError, e:
50-
print 'URLError = ' + str(e.reason)
50+
except urllib.error.URLError as e:
51+
print(('URLError = ' + str(e.reason)))
5152
raise e
52-
except httplib.HTTPException, e:
53-
print 'HTTPException = ' + str(e)
53+
except http.client.HTTPException as e:
54+
print(('HTTPException = ' + str(e)))
5455
raise e
5556
except Exception:
5657
import traceback
57-
print 'generic exception: ' + traceback.format_exc()
58+
print(('generic exception: ' + traceback.format_exc()))
5859
raise IOError

‎CI/lastRelease.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ def getLastReleaseTag():
1313
# main
1414
def main():
1515
result = getLastReleaseTag()
16-
print result
16+
print(result)
1717

1818
# here start main
1919
main()
20+

‎CI/lastReleaseV1.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ def getLastReleaseTag():
1313
# main
1414
def main():
1515
result = getLastReleaseTag()
16-
print result
16+
print(result)
1717

1818
# here start main
1919
main()
20+

‎CI/publishRelease.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@ def main(tag):
2525

2626
# here start main
2727
main(sys.argv[1])
28+

0 commit comments

Comments
 (0)