Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ci): pin py-cpuinfo to 8.0.0 (backport #4375) #4379

Merged
merged 5 commits into from
Nov 8, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 26, 2022

This is an automatic backport of pull request #4375 done by Mergify.

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

## Description
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.

## Checklist
- [ ] Add additional sections for `feat` and `fix` pull requests.
- [ ] [Library documentation](https://github.com/DataDog/dd-trace-py/tree/1.x/docs) and/or [Datadog's documentation site](https://github.com/DataDog/documentation/) is updated. Link to doc PR in description.

## Motivation

## Design

## Testing strategy

## Relevant issue(s)

## Testing strategy

## Reviewer Checklist
- [ ] Title is accurate.
- [ ] Description motivates each change.
- [ ] No unnecessary changes were introduced in this PR.
- [ ] Avoid breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes unless absolutely necessary.
- [ ] Tests provided or description of manual testing performed is included in the code or PR.
- [ ] Release note has been added for fixes and features, or else `changelog/no-changelog` label added.
- [ ] All relevant GitHub issues are correctly linked.
- [ ] Backports are identified and tagged with Mergifyio.

(cherry picked from commit f8ebe5f)

# Conflicts:
#	riotfile.py
#	tox.ini
@mergify mergify bot requested a review from a team as a code owner October 26, 2022 15:01
@mergify mergify bot added the conflicts label Oct 26, 2022
@mergify mergify bot mentioned this pull request Oct 26, 2022
10 tasks
@mergify mergify bot removed the conflicts label Oct 26, 2022
@Yun-Kim Yun-Kim added the changelog/no-changelog A changelog entry is not required for this PR. label Oct 26, 2022
brettlangdon
brettlangdon previously approved these changes Oct 26, 2022
Yun-Kim
Yun-Kim previously approved these changes Oct 26, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Oct 27, 2022

@mergify[bot] this pull request is now in conflict 😩

@mergify mergify bot added the conflicts label Oct 27, 2022
@codecov-commenter
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (0.61@9de953d). Click here to learn what that means.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             0.61    #4379   +/-   ##
=======================================
  Coverage        ?   78.66%           
=======================================
  Files           ?      663           
  Lines           ?    48475           
  Branches        ?        0           
=======================================
  Hits            ?    38133           
  Misses          ?    10342           
  Partials        ?        0           

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@mabdinur mabdinur dismissed stale reviews from Yun-Kim and brettlangdon via 0c3b426 November 4, 2022 17:58
@mergify mergify bot removed the conflicts label Nov 4, 2022
@Kyle-Verhoog Kyle-Verhoog merged commit 3b66a6d into 0.61 Nov 8, 2022
@Kyle-Verhoog Kyle-Verhoog deleted the mergify/bp/0.61/pr-4375 branch November 8, 2022 01:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog/no-changelog A changelog entry is not required for this PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants