Skip to content

Commit

Permalink
fix(ci): pin py-cpuinfo to 8.0.0 (backport #4375) (#4379)
Browse files Browse the repository at this point in the history
Our profiler and benchmark test suites currently use pytest-benchmark, which internally relies on a plugin import to `py-cpuinfo`, which has released a major version 9.x dropping support for Python <= 3.6. This has broken our profiler and benchmark test suites, so I've pinned those test suites to use `py-cpuinfo==8.0.0` which was the latest released version which still supports Python<=3.6.


Co-authored-by: Yun Kim <35776586+Yun-Kim@users.noreply.github.com>
Co-authored-by: Yun Kim <yun.kim@datadoghq.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Munir Abdinur <munir.abdinur@datadoghq.com>
  • Loading branch information
4 people authored Nov 8, 2022
1 parent ec0f291 commit 3b66a6d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions riotfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,10 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
Venv(
pys=select_pys(),
pkgs={
# pytest-benchmark depends on cpuinfo which dropped support for Python<=3.6 in 9.0
# See https://github.com/workhorsy/py-cpuinfo/issues/177
"pytest-benchmark": latest,
"py-cpuinfo": "~=8.0.0",
"msgpack": latest,
# TODO: remove py dependency once https://github.com/ionelmc/pytest-benchmark/pull/227 is released
"py": latest,
Expand Down
3 changes: 3 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@ deps =
py{27,35,36,37,38,39}-profile: uwsgi
# TODO: remove py dependency once https://github.com/ionelmc/pytest-benchmark/pull/227 is released
profile: py
# pytest-benchmark depends on cpuinfo which dropped support for Python<=3.6 in 9.0
# See https://github.com/workhorsy/py-cpuinfo/issues/177
profile: py-cpuinfo==8.0.0
py{27,35,36,37,38,39}-profile-minreqs: protobuf==3.0.0
py310-profile-minreqs: protobuf==3.8.0
profile-minreqs: tenacity==5.0.1
Expand Down

0 comments on commit 3b66a6d

Please sign in to comment.