Skip to content

Commit 43047c6

Browse files
ben--meta-codesync[bot]
authored andcommitted
fix(oss): Get integration tests running
Summary: Recent changes to EdenFS have caused the OSS build of integration tests to go stale. These are some targeted fixes to get them working again: 1. Make the python-psutil package available 2. Fix the build "egg" generation The second one puts a wrap on all the changes required by recent updates to EdenFS that required hybrid (python+native and/or cython) libraries. The weirdest part that was required was renaming the targets to end in `.egg` -- this is actually required by one part of the python build infrastructure which tries to detect whether it is in a directory that ends with the `.egg` extension. Tested through building Sapling/EdenFS (requires other fixes to run clean): ``` act --container-architecture linux/x86_64 -W .github/workflows/edenfs_linux.yml ``` X-link: facebook/sapling#1133 Reviewed By: genevievehelsel Differential Revision: D83085685 Pulled By: bherila fbshipit-source-id: a4dfa326d4282a58ab539695bb566a275c6d6b90
1 parent 8cb6631 commit 43047c6

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

build/fbcode_builder/manifests/eden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ rocksdb
2727
re2
2828
libgit2
2929
pexpect
30+
python-psutil
3031
python-toml
3132
python-filelock
3233
edencommon
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[manifest]
2+
name = python-psutil
3+
4+
[download]
5+
url = https://files.pythonhosted.org/packages/bf/b9/b0eb3f3cbcb734d930fdf839431606844a825b23eaf9a6ab371edac8162c/psutil-7.0.0-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl
6+
sha256 = 4b1388a4f6875d7e2aff5c4ca1cc16c545ed41dd8bb596cefea80111db353a34
7+
8+
[build]
9+
builder = python-wheel
10+

0 commit comments

Comments
 (0)