Skip to content

Commit 8a234bc

Browse files
ahornbymeta-codesync[bot]
authored andcommitted
fix windows build setuptools error
Summary: X-link: facebook/watchman#1316 The upgrade of setuptools in D79195099 broke pywatchman build, Github windows CI erroring with `AttributeError: module 'setuptools.dist' has no attribute 'check_test_suite'` https://github.com/facebook/watchman/actions/runs/19440507973/job/55622405533#step:131:1188 . It was only affecting windows as only windows CI is building dependencies form source, the others use system dependencies. Fix by pinning watchman to the previous setuptools version Fix to help iterate locally: * fix the cargo.py remove behaviour to use rmtree_more. This fixes repeat local builds while debugging. After the first build was getting `PermissionError: [WinError 5] Access is denied: 'Z:\build\fbthrift\source\.git\objects\pack\pack-250eb41d409d8c0f512fdb239d0225fa35d50c3d.idx'` Reviewed By: bigfootjon Differential Revision: D87655865 fbshipit-source-id: 8948b0ffe38f304fa96051bf6ac3a0455ef1a16e
1 parent 5def7e1 commit 8a234bc

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

build/fbcode_builder/getdeps/cargo.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import typing
1414

1515
from .builder import BuilderBase
16-
from .copytree import simple_copytree
16+
from .copytree import rmtree_more, simple_copytree
1717

1818
if typing.TYPE_CHECKING:
1919
from .buildopts import BuildOptions
@@ -79,7 +79,7 @@ def recreate_dir(self, src, dst) -> None:
7979
if os.path.islink(dst):
8080
os.remove(dst)
8181
else:
82-
shutil.rmtree(dst)
82+
rmtree_more(dst)
8383
simple_copytree(src, dst)
8484

8585
def recreate_linked_dir(self, src, dst) -> None:
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[manifest]
2+
name = python-setuptools-69
3+
4+
[download]
5+
url = https://files.pythonhosted.org/packages/c0/7a/3da654f49c95d0cc6e9549a855b5818e66a917e852ec608e77550c8dc08b/setuptools-69.1.1-py3-none-any.whl
6+
sha256 = 02fa291a0471b3a18b2b2481ed902af520c69e8ae0919c13da936542754b4c56
7+
8+
[build]
9+
builder = python-wheel
10+
11+
[rpms]
12+
python3-setuptools
13+
14+
[homebrew]
15+
python-setuptools
16+
17+
[debs]
18+
python3-setuptools

build/fbcode_builder/manifests/watchman

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ fbthrift
1919
folly
2020
pcre2
2121
googletest
22-
python-setuptools
22+
python-setuptools-69
2323

2424
[dependencies.fbsource=on]
2525
rust

0 commit comments

Comments
 (0)