⚠ This page is served via a proxy. Original site: https://github.com
This service does not collect credentials or authentication data.
Skip to content
This repository was archived by the owner on Jul 16, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions .github/workflows/build_assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,21 @@ jobs:
TARGET: macos
# currently, wrapt pulls the arm64 version instead of the universal one, so the below is a hack
CMD_REQS: >
mkdir -p pip-packages && cd pip-packages && pip wheel --no-cache-dir --no-binary tree_sitter,ijson,charset_normalizer,PyYAML .. &&
mkdir -p pip-packages && cd pip-packages && pip wheel --no-cache-dir --no-binary ijson,charset_normalizer,PyYAML .. &&
rm $(ls | grep wrapt) && pip download wrapt --platform=universal2 --only-binary=:all: && pip install $(ls | grep wrapt) --force-reinstall && cd .. &&
pip install --no-deps --no-index --find-links=pip-packages pip-packages/*
CMD_BUILD: >
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|^./||'") &&
pyinstaller --add-binary ${STATICCODECOV_LIB_PATH}:. --copy-metadata codecov-cli --hidden-import staticcodecov_languages --target-arch universal2 -F codecov_cli/main.py &&
pyinstaller --copy-metadata codecov-cli --target-arch universal2 -F codecov_cli/main.py &&
mv dist/main dist/codecovcli_macos &&
lipo -archs dist/codecovcli_macos | grep 'x86_64 arm64'
OUT_FILE_NAME: codecovcli_macos
ASSET_MIME: application/octet-stream
- os: ubuntu-20.04
- os: ubuntu-22.04
TARGET: ubuntu
CMD_REQS: >
pip install -r requirements.txt && pip install .
CMD_BUILD: >
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|^./||'") &&
pyinstaller --add-binary ${STATICCODECOV_LIB_PATH}:. --copy-metadata codecov-cli --hidden-import staticcodecov_languages -F codecov_cli/main.py &&
pyinstaller --copy-metadata codecov-cli -F codecov_cli/main.py &&
cp ./dist/main ./dist/codecovcli_linux
OUT_FILE_NAME: codecovcli_linux
ASSET_MIME: application/octet-stream
Expand All @@ -46,7 +44,7 @@ jobs:
CMD_REQS: >
pip install -r requirements.txt && pip install .
CMD_BUILD: >
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 &&
pyinstaller --copy-metadata codecov-cli -F codecov_cli\main.py &&
Copy-Item -Path ".\dist\main.exe" -Destination ".\dist\codecovcli_windows.exe"
OUT_FILE_NAME: codecovcli_windows.exe
ASSET_MIME: application/vnd.microsoft.portable-executable
Expand Down
6 changes: 0 additions & 6 deletions .gitmodules

This file was deleted.

2 changes: 0 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
include languages/treesitterjavascript/src/tree_sitter/parser.h
include languages/treesitterpython/src/tree_sitter/parser.h
include requirements.txt

recursive-include codecov_cli *
Expand Down
21 changes: 0 additions & 21 deletions languages/languages.c

This file was deleted.

1 change: 0 additions & 1 deletion languages/treesitterjavascript
Submodule treesitterjavascript deleted from 936d97
1 change: 0 additions & 1 deletion languages/treesitterpython
Submodule treesitterpython deleted from de221e
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ dependencies = [
"responses==0.21.*",
"sentry-sdk>=2.20.0",
"test-results-parser==0.5.4",
"tree-sitter==0.20.*",
"wrapt>=1.17.2",
]
license = {file = "LICENSE"}
Expand Down
8 changes: 1 addition & 7 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# pip-compile --all-build-deps --all-extras pyproject.toml
Expand Down Expand Up @@ -29,8 +29,6 @@ idna==3.10
# requests
ijson==3.3.0
# via codecov-cli (pyproject.toml)
packaging==24.2
# via setuptools-scm
pyyaml==6.0.2
# via codecov-cli (pyproject.toml)
regex==2024.11.6
Expand All @@ -41,16 +39,12 @@ responses==0.21.0
# via codecov-cli (pyproject.toml)
sentry-sdk==2.20.0
# via codecov-cli (pyproject.toml)
setuptools-scm==8.1.0
# via codecov-cli (pyproject.toml::build-system.requires)
sniffio==1.3.1
# via
# anyio
# httpx
test-results-parser==0.5.4
# via codecov-cli (pyproject.toml)
tree-sitter==0.20.4
# via codecov-cli (pyproject.toml)
typing-extensions==4.12.2
# via anyio
urllib3==2.3.0
Expand Down
3 changes: 1 addition & 2 deletions scripts/build_alpine_arm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ apk add musl-dev build-base
pip install -r requirements.txt
pip install .
python setup.py build
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|^./||'")
pip install pyinstaller
pyinstaller --add-binary ${STATICCODECOV_LIB_PATH}:. --copy-metadata codecov-cli --hidden-import staticcodecov_languages -F codecov_cli/main.py
pyinstaller --copy-metadata codecov-cli -F codecov_cli/main.py
cp ./dist/main ./dist/codecovcli_$1
3 changes: 1 addition & 2 deletions scripts/build_linux_arm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ apt install build-essential
pip install -r requirements.txt
pip install .
python setup.py build
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|^./||'")
pip install pyinstaller
pyinstaller --add-binary ${STATICCODECOV_LIB_PATH}:. --copy-metadata codecov-cli --hidden-import staticcodecov_languages -F codecov_cli/main.py
pyinstaller --copy-metadata codecov-cli -F codecov_cli/main.py
cp ./dist/main ./dist/codecovcli_$1
28 changes: 2 additions & 26 deletions setup.py
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Swatinem you could've just deleted this file for good as a part of this patch. There's no use for it once you're done with the C-extensions.

Original file line number Diff line number Diff line change
@@ -1,27 +1,3 @@
from platform import system
from setuptools import setup

from setuptools import Extension, setup

setup(
ext_modules=[
Extension(
"staticcodecov_languages",
[
"languages/languages.c",
"languages/treesitterpython/src/parser.c",
"languages/treesitterjavascript/src/parser.c",
"languages/treesitterpython/src/scanner.cc",
"languages/treesitterjavascript/src/scanner.c",
],
include_dirs=[
"languages/treesitterpython/src",
"languages/treesitterjavascript/src",
"languages/treesitterjavascript/src/tree_sitter",
"languages/treesitterpython/src/tree_sitter",
],
extra_compile_args=(
["-Wno-unused-variable"] if system() != "Windows" else None
),
)
],
)
setup()