Skip to content

Commit 1104726

Browse files
committed
Remove tree-sitter and associated build infrastructure
1 parent 9ebe213 commit 1104726

File tree

11 files changed

+8
-74
lines changed

11 files changed

+8
-74
lines changed

.github/workflows/build_assets.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@ jobs:
2121
TARGET: macos
2222
# currently, wrapt pulls the arm64 version instead of the universal one, so the below is a hack
2323
CMD_REQS: >
24-
mkdir -p pip-packages && cd pip-packages && pip wheel --no-cache-dir --no-binary tree_sitter,ijson,charset_normalizer,PyYAML .. &&
24+
mkdir -p pip-packages && cd pip-packages && pip wheel --no-cache-dir --no-binary ijson,charset_normalizer,PyYAML .. &&
2525
rm $(ls | grep wrapt) && pip download wrapt --platform=universal2 --only-binary=:all: && pip install $(ls | grep wrapt) --force-reinstall && cd .. &&
2626
pip install --no-deps --no-index --find-links=pip-packages pip-packages/*
2727
CMD_BUILD: >
28-
STATICCODECOV_LIB_PATH=$(find build/ -maxdepth 1 -type d -name 'lib.*' -print -quit | xargs -I {} sh -c "find {} -type f -name 'staticcodecov*' -print -quit | sed 's|^./||'") &&
29-
pyinstaller --add-binary ${STATICCODECOV_LIB_PATH}:. --copy-metadata codecov-cli --hidden-import staticcodecov_languages --target-arch universal2 -F codecov_cli/main.py &&
28+
pyinstaller --copy-metadata codecov-cli --target-arch universal2 -F codecov_cli/main.py &&
3029
mv dist/main dist/codecovcli_macos &&
3130
lipo -archs dist/codecovcli_macos | grep 'x86_64 arm64'
3231
OUT_FILE_NAME: codecovcli_macos
@@ -37,8 +36,7 @@ jobs:
3736
CMD_REQS: >
3837
pip install -r requirements.txt && pip install .
3938
CMD_BUILD: >
40-
STATICCODECOV_LIB_PATH=$(find build/ -maxdepth 1 -type d -name 'lib.*' -print -quit | xargs -I {} sh -c "find {} -type f -name 'staticcodecov*' -print -quit | sed 's|^./||'") &&
41-
pyinstaller --add-binary ${STATICCODECOV_LIB_PATH}:. --copy-metadata codecov-cli --hidden-import staticcodecov_languages -F codecov_cli/main.py &&
39+
pyinstaller --copy-metadata codecov-cli -F codecov_cli/main.py &&
4240
cp ./dist/main ./dist/codecovcli_linux
4341
OUT_FILE_NAME: codecovcli_linux
4442
ASSET_MIME: application/octet-stream
@@ -48,7 +46,7 @@ jobs:
4846
CMD_REQS: >
4947
pip install -r requirements.txt && pip install .
5048
CMD_BUILD: >
51-
pyinstaller --add-binary "build\lib.win-amd64-cpython-311\staticcodecov_languages.cp311-win_amd64.pyd;." --copy-metadata codecov-cli --hidden-import staticcodecov_languages -F codecov_cli\main.py &&
49+
pyinstaller --copy-metadata codecov-cli -F codecov_cli\main.py &&
5250
Copy-Item -Path ".\dist\main.exe" -Destination ".\dist\codecovcli_windows.exe"
5351
OUT_FILE_NAME: codecovcli_windows.exe
5452
ASSET_MIME: application/vnd.microsoft.portable-executable

.gitmodules

Lines changed: 0 additions & 6 deletions
This file was deleted.

codecov-cli/MANIFEST.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
include languages/treesitterjavascript/src/tree_sitter/parser.h
2-
include languages/treesitterpython/src/tree_sitter/parser.h
31
include requirements.txt
42

53
recursive-include codecov_cli *

codecov-cli/languages/languages.c

Lines changed: 0 additions & 21 deletions
This file was deleted.
Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 0 additions & 1 deletion
This file was deleted.

codecov-cli/pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ dependencies = [
1919
"responses==0.21.*",
2020
"sentry-sdk>=2.20.0",
2121
"test-results-parser==0.5.4",
22-
"tree-sitter==0.20.*",
2322
"wrapt>=1.17.2",
2423
]
2524
license = {file = "LICENSE"}

codecov-cli/requirements.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ idna==3.10
2929
# requests
3030
ijson==3.3.0
3131
# via codecov-cli (pyproject.toml)
32-
packaging==24.2
33-
# via setuptools-scm
3432
pyyaml==6.0.2
3533
# via codecov-cli (pyproject.toml)
3634
regex==2024.11.6
@@ -41,16 +39,12 @@ responses==0.21.0
4139
# via codecov-cli (pyproject.toml)
4240
sentry-sdk==2.20.0
4341
# via codecov-cli (pyproject.toml)
44-
setuptools-scm==8.1.0
45-
# via codecov-cli (pyproject.toml::build-system.requires)
4642
sniffio==1.3.1
4743
# via
4844
# anyio
4945
# httpx
5046
test-results-parser==0.5.4
5147
# via codecov-cli (pyproject.toml)
52-
tree-sitter==0.20.4
53-
# via codecov-cli (pyproject.toml)
5448
typing-extensions==4.12.2
5549
# via anyio
5650
urllib3==2.3.0

codecov-cli/scripts/build_alpine_arm.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ apk add musl-dev build-base
44
pip install -r requirements.txt
55
pip install .
66
python setup.py build
7-
STATICCODECOV_LIB_PATH=$(find build/ -maxdepth 1 -type d -name 'lib.*' -print -quit | xargs -I {} sh -c "find {} -type f -name 'staticcodecov*' -print -quit | sed 's|^./||'")
87
pip install pyinstaller
9-
pyinstaller --add-binary ${STATICCODECOV_LIB_PATH}:. --copy-metadata codecov-cli --hidden-import staticcodecov_languages -F codecov_cli/main.py
8+
pyinstaller --copy-metadata codecov-cli -F codecov_cli/main.py
109
cp ./dist/main ./dist/codecovcli_$1

codecov-cli/scripts/build_linux_arm.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ apt install build-essential
44
pip install -r requirements.txt
55
pip install .
66
python setup.py build
7-
STATICCODECOV_LIB_PATH=$(find build/ -maxdepth 1 -type d -name 'lib.*' -print -quit | xargs -I {} sh -c "find {} -type f -name 'staticcodecov*' -print -quit | sed 's|^./||'")
87
pip install pyinstaller
9-
pyinstaller --add-binary ${STATICCODECOV_LIB_PATH}:. --copy-metadata codecov-cli --hidden-import staticcodecov_languages -F codecov_cli/main.py
8+
pyinstaller --copy-metadata codecov-cli -F codecov_cli/main.py
109
cp ./dist/main ./dist/codecovcli_$1

0 commit comments

Comments
 (0)