Skip to content

Commit 39d685f

Browse files
let tox install the package (Azure#28586)
1 parent 2d61792 commit 39d685f

File tree

2 files changed

+13
-15
lines changed

2 files changed

+13
-15
lines changed

eng/tox/run_verifytypes.py

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@
2121
logging.getLogger().setLevel(logging.INFO)
2222

2323

24-
def install_editable(setup_path):
25-
commands = [sys.executable, "-m", "pip", "install", "-e", setup_path]
26-
subprocess.check_call(commands)
27-
28-
2924
def install_latest_release(package_name):
3025
from pypi_tools.pypi import PyPIClient
3126

@@ -47,7 +42,7 @@ def install_latest_release(package_name):
4742
]
4843

4944
commands.extend(packages)
50-
subprocess.check_call(commands)
45+
subprocess.check_call(commands, stdout=subprocess.DEVNULL)
5146
return latest_version
5247

5348

@@ -114,22 +109,20 @@ def get_type_complete_score(commands, check_pytyped=False):
114109
"--outputjson",
115110
]
116111

117-
# get type completeness score from latest release
118-
latest_version = install_latest_release(package_name)
119-
if latest_version:
120-
score_from_released = get_type_complete_score(commands)
121-
else:
122-
score_from_released = None
123-
124112
# get type completeness score from current code
125-
install_editable(setup_path)
126113
score_from_current = get_type_complete_score(commands, check_pytyped=True)
127-
128114
try:
129115
subprocess.check_call(commands[:-1])
130116
except subprocess.CalledProcessError:
131117
pass # we don't fail on verifytypes, only if type completeness score worsens from last release
132118

119+
# get type completeness score from latest release
120+
latest_version = install_latest_release(package_name)
121+
if latest_version:
122+
score_from_released = get_type_complete_score(commands)
123+
else:
124+
score_from_released = None
125+
133126
if score_from_released is not None:
134127
score_from_released_rounded = round(score_from_released * 100, 1)
135128
score_from_current_rounded = round(score_from_current * 100, 1)

eng/tox/tox.ini

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,11 @@ deps =
151151
{[base]deps}
152152
pyright==1.1.287
153153
commands =
154+
{envbindir}/python {toxinidir}/../../../eng/tox/create_package_and_install.py \
155+
-d {distdir} \
156+
-p {toxinidir} \
157+
-w {envtmpdir} \
158+
--package-type sdist
154159
{envbindir}/python {toxinidir}/../../../eng/tox/run_verifytypes.py -t {toxinidir}
155160

156161

0 commit comments

Comments
 (0)