Skip to content

Commit a075c3d

Browse files
committed
chore: Refactor project structure by replacing CMake with setuptools for building, enhancing build hooks for downloading and staging prebuilt clang-tidy binaries, and updating .gitignore to include additional ignored files.
1 parent 5979a9c commit a075c3d

11 files changed

Lines changed: 556 additions & 183 deletions

File tree

.github/workflows/upstream.yml

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,31 @@ jobs:
5959
env:
6060
LATEST_VERSION: ${{ steps.check.outputs.latest_version }}
6161
PINNED_VERSION: ${{ steps.check.outputs.pinned_version }}
62-
62+
- uses: actions/github-script@v7
63+
if: steps.check.outputs.newer_prebuilt_release_available == 'true'
64+
with:
65+
script: |
66+
const title = `Prebuilt clang-tools release ${process.env.LATEST_PREBUILT_RELEASE} is available`;
67+
const { data: issues } = await github.rest.issues.listForRepo({
68+
owner: context.repo.owner,
69+
repo: context.repo.repo,
70+
state: 'open',
71+
});
72+
if (issues.some((issue) => issue.title === title)) {
73+
core.info(`Issue already open: ${title}`);
74+
return;
75+
}
76+
await github.rest.issues.create({
77+
owner: context.repo.owner,
78+
repo: context.repo.repo,
79+
title,
80+
body: [
81+
`Pinned prebuilt release: ${process.env.PINNED_PREBUILT_RELEASE}`,
82+
`Latest prebuilt release: ${process.env.LATEST_PREBUILT_RELEASE}`,
83+
'',
84+
'Review the new `muttleyxd/clang-tools-static-binaries` release tag and update `pyproject.toml` when ready.',
85+
].join('\n'),
86+
});
87+
env:
88+
LATEST_PREBUILT_RELEASE: ${{ steps.check.outputs.latest_prebuilt_release }}
89+
PINNED_PREBUILT_RELEASE: ${{ steps.check.outputs.pinned_prebuilt_release }}

.github/workflows/wheels.yml

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,42 +15,38 @@ jobs:
1515
runs-on: ${{ matrix.runs_on }}
1616
env:
1717
CIBW_BUILD: "cp39-*"
18-
CMAKE_BUILD_PARALLEL_LEVEL: "4"
19-
CTIDY_LLVM_DOWNLOAD_DIR: ${{ github.workspace }}/.cache/llvm-downloads
18+
CTIDY_DOWNLOAD_DIR: ${{ github.workspace }}/.cache/ctidy-downloads
2019
CIBW_ARCHS: ${{ matrix.cibw_archs }}
20+
MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macos_deployment_target }}
2121
strategy:
2222
fail-fast: false
2323
matrix:
2424
include:
2525
- name: linux-x86_64
2626
runs_on: ubuntu-latest
2727
cibw_archs: x86_64
28-
use_ccache: true
28+
macos_deployment_target: ""
29+
- name: macos-x86_64
30+
runs_on: macos-13
31+
cibw_archs: x86_64
32+
macos_deployment_target: "10.15"
33+
- name: macos-arm64
34+
runs_on: macos-14
35+
cibw_archs: arm64
36+
macos_deployment_target: "11.0"
37+
- name: windows-amd64
38+
runs_on: windows-latest
39+
cibw_archs: AMD64
40+
macos_deployment_target: ""
2941
steps:
3042
- uses: actions/checkout@v4
3143
- uses: actions/setup-python@v5
3244
with:
3345
python-version: "3.12"
3446
- uses: actions/cache@v4
3547
with:
36-
path: .cache/llvm-downloads
37-
key: llvm-downloads-${{ matrix.name }}-${{ hashFiles('pyproject.toml') }}
38-
- if: matrix.use_ccache
39-
uses: actions/cache@v4
40-
with:
41-
path: .ccache
42-
key: ccache-${{ matrix.name }}-${{ hashFiles('CMakeLists.txt', 'pyproject.toml', 'src/ctidy/**') }}
43-
restore-keys: |
44-
ccache-${{ matrix.name }}-
45-
- if: matrix.use_ccache && startsWith(matrix.runs_on, 'ubuntu')
46-
run: sudo apt-get update && sudo apt-get install -y ccache
47-
- if: matrix.use_ccache && startsWith(matrix.runs_on, 'macos')
48-
run: brew install ccache
49-
- if: matrix.use_ccache
50-
run: |
51-
echo "CCACHE_DIR=$GITHUB_WORKSPACE/.ccache" >> "$GITHUB_ENV"
52-
echo "CMAKE_C_COMPILER_LAUNCHER=$(command -v ccache)" >> "$GITHUB_ENV"
53-
echo "CMAKE_CXX_COMPILER_LAUNCHER=$(command -v ccache)" >> "$GITHUB_ENV"
48+
path: .cache/ctidy-downloads
49+
key: ctidy-downloads-${{ matrix.name }}-${{ hashFiles('build_hooks.py', 'pyproject.toml', 'setup.py') }}
5450
- run: python -m pip install --upgrade cibuildwheel
5551
- run: python -m cibuildwheel --output-dir wheelhouse
5652
- uses: actions/upload-artifact@v4

.gitignore

Lines changed: 216 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,216 @@
1-
/.venv
2-
/build
3-
/dist
4-
/*.egg-info
5-
/wheelhouse
6-
/.pytest_cache
1+
# Byte-compiled / optimized / DLL files
2+
__pycache__/
3+
*.py[codz]
4+
*$py.class
5+
6+
# C extensions
7+
*.so
8+
9+
# Distribution / packaging
10+
.Python
11+
build/
12+
develop-eggs/
13+
dist/
14+
downloads/
15+
eggs/
16+
.eggs/
17+
lib/
18+
lib64/
19+
parts/
20+
sdist/
21+
var/
22+
wheels/
23+
share/python-wheels/
24+
*.egg-info/
25+
.installed.cfg
26+
*.egg
27+
MANIFEST
28+
29+
# PyInstaller
30+
# Usually these files are written by a python script from a template
31+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
32+
*.manifest
33+
*.spec
34+
35+
# Installer logs
36+
pip-log.txt
37+
pip-delete-this-directory.txt
38+
39+
# Unit test / coverage reports
40+
htmlcov/
41+
.tox/
42+
.nox/
43+
.coverage
44+
.coverage.*
45+
.cache
46+
nosetests.xml
47+
coverage.xml
48+
*.cover
49+
*.py.cover
50+
.hypothesis/
51+
.pytest_cache/
52+
cover/
53+
54+
# Translations
55+
*.mo
56+
*.pot
57+
58+
# Django stuff:
59+
*.log
60+
local_settings.py
61+
db.sqlite3
62+
db.sqlite3-journal
63+
64+
# Flask stuff:
65+
instance/
66+
.webassets-cache
67+
68+
# Scrapy stuff:
69+
.scrapy
70+
71+
# Sphinx documentation
72+
docs/_build/
73+
74+
# PyBuilder
75+
.pybuilder/
76+
target/
77+
78+
# Jupyter Notebook
79+
.ipynb_checkpoints
80+
81+
# IPython
82+
profile_default/
83+
ipython_config.py
84+
85+
# pyenv
86+
# For a library or package, you might want to ignore these files since the code is
87+
# intended to run in multiple environments; otherwise, check them in:
88+
# .python-version
89+
90+
# pipenv
91+
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
92+
# However, in case of collaboration, if having platform-specific dependencies or dependencies
93+
# having no cross-platform support, pipenv may install dependencies that don't work, or not
94+
# install all needed dependencies.
95+
# Pipfile.lock
96+
97+
# UV
98+
# Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control.
99+
# This is especially recommended for binary packages to ensure reproducibility, and is more
100+
# commonly ignored for libraries.
101+
# uv.lock
102+
103+
# poetry
104+
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
105+
# This is especially recommended for binary packages to ensure reproducibility, and is more
106+
# commonly ignored for libraries.
107+
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
108+
# poetry.lock
109+
# poetry.toml
110+
111+
# pdm
112+
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
113+
# pdm recommends including project-wide configuration in pdm.toml, but excluding .pdm-python.
114+
# https://pdm-project.org/en/latest/usage/project/#working-with-version-control
115+
# pdm.lock
116+
# pdm.toml
117+
.pdm-python
118+
.pdm-build/
119+
120+
# pixi
121+
# Similar to Pipfile.lock, it is generally recommended to include pixi.lock in version control.
122+
# pixi.lock
123+
# Pixi creates a virtual environment in the .pixi directory, just like venv module creates one
124+
# in the .venv directory. It is recommended not to include this directory in version control.
125+
.pixi
126+
127+
# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
128+
__pypackages__/
129+
130+
# Celery stuff
131+
celerybeat-schedule
132+
celerybeat.pid
133+
134+
# Redis
135+
*.rdb
136+
*.aof
137+
*.pid
138+
139+
# RabbitMQ
140+
mnesia/
141+
rabbitmq/
142+
rabbitmq-data/
143+
144+
# ActiveMQ
145+
activemq-data/
146+
147+
# SageMath parsed files
148+
*.sage.py
149+
150+
# Environments
151+
.env
152+
.envrc
153+
.venv
154+
env/
155+
venv/
156+
ENV/
157+
env.bak/
158+
venv.bak/
159+
160+
# Spyder project settings
161+
.spyderproject
162+
.spyproject
163+
164+
# Rope project settings
165+
.ropeproject
166+
167+
# mkdocs documentation
168+
/site
169+
170+
# mypy
171+
.mypy_cache/
172+
.dmypy.json
173+
dmypy.json
174+
175+
# Pyre type checker
176+
.pyre/
177+
178+
# pytype static type analyzer
179+
.pytype/
180+
181+
# Cython debug symbols
182+
cython_debug/
183+
184+
# PyCharm
185+
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
186+
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
187+
# and can be added to the global gitignore or merged into this file. For a more nuclear
188+
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
189+
# .idea/
190+
191+
# Abstra
192+
# Abstra is an AI-powered process automation framework.
193+
# Ignore directories containing user credentials, local state, and settings.
194+
# Learn more at https://abstra.io/docs
195+
.abstra/
196+
197+
# Visual Studio Code
198+
# Visual Studio Code specific template is maintained in a separate VisualStudioCode.gitignore
199+
# that can be found at https://github.com/github/gitignore/blob/main/Global/VisualStudioCode.gitignore
200+
# and can be added to the global gitignore or merged into this file. However, if you prefer,
201+
# you could uncomment the following to ignore the entire vscode folder
202+
# .vscode/
203+
204+
# Ruff stuff:
205+
.ruff_cache/
206+
207+
# PyPI configuration file
208+
.pypirc
209+
210+
# Marimo
211+
marimo/_static/
212+
marimo/_lsp/
213+
__marimo__/
214+
215+
# Streamlit
216+
.streamlit/secrets.toml

0 commit comments

Comments
 (0)