Skip to content

Commit c891c27

Browse files
authored
[Python] python track1 new pipeline (Azure#16489)
* exception handle and encode problem * Update autorest_tools.py
1 parent 561abe2 commit c891c27

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

scripts/automation_generate.sh

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,19 @@ sudo npm install -g n
1010
sudo n 10.15.0
1111
export PATH=/usr/local/n/versions/node/10.15.0/bin:$PATH
1212

13-
# generate code and package
14-
python -m packaging_tools.auto_codegen "$1" "$TMPDIR/venv-sdk/auto_temp.json" 2>&1
13+
TEMP_FILE="$TMPDIR/venv-sdk/auto_temp.json"
14+
# generate code
15+
python -m packaging_tools.auto_codegen "$1" "$TEMP_FILE" 2>&1
1516
echo "[Generate] codegen done!!!"
16-
python -m packaging_tools.auto_package "$TMPDIR/venv-sdk/auto_temp.json" "$2" 2>&1
17-
echo "[Generate] generate done!!!"
17+
if [ ! -f "$TEMP_FILE" ]; then
18+
echo "[Autorest]$TEMP_FILE does not exist!!!Error happened during codegen"
19+
exit 1
20+
fi
1821

22+
# package
23+
python -m packaging_tools.auto_package "$TEMP_FILE" "$2" 2>&1
24+
echo "[Generate] generate done!!!"
1925
if [ ! -f "$2" ]; then
20-
echo "[Autorest]$2 does not exist!!!"
21-
fi
26+
echo "[Autorest]$2 does not exist!!!Error happened during package"
27+
exit 1
28+
fi

tools/azure-sdk-tools/packaging_tools/auto_package.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ def change_log_generate(package_name):
4747
def main(generate_input, generate_output):
4848
with open(generate_input, "r") as reader:
4949
data = json.load(reader)
50-
if not data:
51-
return
5250

5351
sdk_folder = '.'
5452
result = {

tools/azure-sdk-tools/packaging_tools/swaggertosdk/autorest_tools.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import shutil
66
import subprocess
77

8-
98
_LOGGER = logging.getLogger(__name__)
109

1110

@@ -130,7 +129,8 @@ def execute_simple_command(cmd_line, cwd=None, shell=False, env=None):
130129
universal_newlines=True,
131130
cwd=cwd,
132131
shell=shell,
133-
env=env)
132+
env=env,
133+
encoding='utf-8')
134134
output_buffer = []
135135
for line in process.stdout:
136136
output_buffer.append(line.rstrip())

0 commit comments

Comments
 (0)