Skip to content

Commit 696881c

Browse files
committed
chore: remove dead tox.ini, fix Makefile and pyproject.toml
- Delete tox.ini (listed py38/39/310, referenced non-existent requirements_dev.txt, used tox 3 syntax -- dead code) - Remove /requirements/* from sdist includes (directory doesn't exist) - Update Makefile: dev-install uses uv sync, update-deps uses uv lock, lint uses ruff, release removes non-existent pin_dependencies.py, test-all documents CI-only multi-version testing, clean-test drops .tox - Add ruff to dev dependency group so make lint works before Ruff config migration
1 parent 1292386 commit 696881c

4 files changed

Lines changed: 38 additions & 29 deletions

File tree

Makefile

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,20 @@ clean-pyc: ## remove Python file artifacts
4040
find . -name '__pycache__' -exec rm -fr {} +
4141

4242
clean-test: ## remove test and coverage artifacts
43-
rm -fr .tox/
4443
rm -f .coverage
4544
rm -fr htmlcov/
4645
rm -f output.xml
4746
rm -f report.html
4847

49-
lint: ## check style with flake8
50-
flake8 cumulusci tests
48+
lint: ## check style with ruff and pyright
49+
ruff check cumulusci tests
50+
ruff format --check cumulusci tests
5151

5252
test: ## run tests quickly with the default Python
5353
pytest
5454

55-
test-all: ## run tests on every Python version with tox
56-
tox
55+
test-all: ## run tests on every Python version via CI matrix
56+
@echo "Multi-version testing runs in CI. Use 'pytest' for local testing."
5757

5858
# Use CLASS_PATH to run coverage for a subset of tests.
5959
# $ make coverage CLASS_PATH="cumulusci/core/tests"
@@ -82,7 +82,6 @@ servedocs: docs ## compile the docs watching for changes
8282
watchmedo shell-command -p '*.rst' -c '$(MAKE) -C docs html' -R -D .
8383

8484
release: clean ## package and upload a release
85-
python utility/pin_dependencies.py
8685
hatch build
8786
hatch publish
8887

@@ -97,15 +96,11 @@ tag: clean
9796
git tag -a -m 'version $$(hatch version)' v$$(hatch version)
9897
git push --follow-tags
9998

100-
update-deps:
101-
echo Use the _Update Python Dependencies_ Github action for real releases
102-
pip-compile --upgrade --resolver=backtracking --output-file=requirements/prod.txt pyproject.toml
103-
pip-compile --upgrade --resolver=backtracking --output-file=requirements/dev.txt --all-extras pyproject.toml
99+
update-deps: ## update all dependencies via uv
100+
uv lock --upgrade
104101

105-
dev-install:
106-
python -m pip install --upgrade pip pip-tools setuptools
107-
pip-sync requirements/*.txt
108-
python -m pip install -e .
102+
dev-install: ## install development dependencies via uv
103+
uv sync --group dev
109104

110105
schema:
111106
python -c 'from cumulusci.utils.yaml import cumulusci_yml; open("cumulusci/schema/cumulusci.jsonschema.json", "w").write(cumulusci_yml.CumulusCIRoot.schema_json(indent=4))'

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ dev = [
6767
"factory-boy>=3.3.1",
6868
"furo>=2023.3.27",
6969
"jsonschema>=4.23.0",
70+
"ruff>=0.15.8",
7071
"pytest>=7.0.1",
7172
"pytest-cov>=5.0.0",
7273
"pytest-random-order>=1.1.1",
@@ -117,7 +118,6 @@ include = [
117118
[tool.hatch.build.targets.sdist]
118119
include = [
119120
"/cumulusci",
120-
"/requirements/*", # Needed by tox
121121
"README.md", # needed by hatch-fancy-pypi-readme
122122
"docs/history.md",
123123
# ditto

tox.ini

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

uv.lock

Lines changed: 28 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)