Skip to content

Commit 6ec8426

Browse files
committed
add build deps
1 parent 1d949b2 commit 6ec8426

File tree

3 files changed

+25
-22
lines changed

3 files changed

+25
-22
lines changed

.github/workflows/ci.yml

+8-12
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,13 @@ jobs:
3131
include: ${{ fromJson(needs.prepare.outputs.matrix) }}
3232
name: "Python ${{ matrix.python-version }} + Django ${{ matrix.django-version }}"
3333
runs-on: ubuntu-latest
34-
env:
35-
POETRY_VIRTUALENVS_CREATE: false
3634
steps:
37-
- uses: actions/checkout@v3
38-
- uses: actions/setup-python@v4
35+
- uses: actions/checkout@v4
36+
- uses: actions/setup-python@v5
3937
with:
4038
python-version: ${{ matrix.python-version }}
41-
- run: pip install poetry
42-
- run: poetry install
43-
- run: poetry build --format wheel
39+
- run: pip install -e '.[build,dev]'
40+
- run: python -m build
4441
- name: Make sure tests use dist instead of source
4542
run: |
4643
rm -rf django_object_actions
@@ -51,11 +48,10 @@ jobs:
5148
lint:
5249
runs-on: ubuntu-latest
5350
steps:
54-
- uses: actions/checkout@v3
51+
- uses: actions/checkout@v4
5552
- name: Set up Python
56-
uses: actions/setup-python@v4
53+
uses: actions/setup-python@v5
5754
with:
58-
python-version: "3.12"
59-
- run: pip install poetry
60-
- run: poetry install --with=dev
55+
python-version: "3.13"
56+
- run: pip install -e '.[dev]'
6157
- run: make lint

Makefile

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,23 @@ clean: ## Remove generated files
2424
find . -type d -name "__pycache__" -exec rm -rf {} \; || true
2525

2626
install: ## Install development dependencies
27-
poetry install
27+
pip install -e '.[build,dev]'
2828
pip install Django
2929

3030
lint: ## Check the project for lint errors
31-
poetry run ruff check .
32-
poetry run ruff format --diff .
31+
ruff check .
32+
ruff format --diff .
3333

3434
tdd: ## Run tests with a file watcher
35-
PYTHONPATH=. nodemon --ext py -x sh -c "poetry run python -W ignore::RuntimeWarning $(MANAGE) test --failfast django_object_actions || true"
35+
PYTHONPATH=. nodemon --ext py -x sh -c "python -W ignore::RuntimeWarning $(MANAGE) test --failfast django_object_actions || true"
3636

3737
test: ## Run test suite
38-
PYTHONPATH=. poetry run python -W ignore::RuntimeWarning $(MANAGE) test django_object_actions
38+
PYTHONPATH=. python -W ignore::RuntimeWarning $(MANAGE) test django_object_actions
3939

4040
coverage: ## Run and then display coverage report
41-
poetry run coverage erase
42-
PYTHONPATH=. poetry run coverage run $(MANAGE) test django_object_actions
43-
poetry run coverage report --show-missing
41+
coverage erase
42+
PYTHONPATH=. coverage run $(MANAGE) test django_object_actions
43+
coverage report --show-missing
4444

4545
resetdb: ## Delete and then recreate the dev sqlite database
4646
python $(MANAGE) reset_db --router=default --noinput

pyproject.toml

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1+
[build-system]
2+
requires = ["setuptools", "wheel"]
3+
build-backend = "setuptools.build_meta"
4+
15
[project]
26
name = "django-object-actions"
37
version = "4.3.0"
48
description = "A Django app for adding object tools for models in the admin"
59
authors = [{ name = "crccheck", email = "c@crccheck.com" }]
610
license = { text = "Apache-2.0" }
711
readme = "README.md"
8-
# repository = "https://github.com/crccheck/django-object-actions"
912
keywords = ["django", "admin"]
1013
classifiers = [
1114
"Development Status :: 5 - Production/Stable",
@@ -21,6 +24,9 @@ classifiers = [
2124
"Programming Language :: Python :: 3.13",
2225
]
2326

27+
[project.urls]
28+
"Homepage" = "https://github.com/crccheck/django-object-actions"
29+
2430
[project.optional-dependencies]
2531
dev = [
2632
"coverage==7.*",
@@ -29,14 +35,15 @@ dev = [
2935
"dj-database-url==2.*",
3036
"ruff",
3137
]
38+
build = ["build", "twine"]
3239

3340
[tool.setuptools]
3441
packages = ["django_object_actions"]
3542

3643
[tool.semantic_release]
3744
version_toml = ["pyproject.toml:project.version"]
3845
version_variables = ["django_object_actions/__init__.py:__version__"]
39-
build_command = "pip build"
46+
build_command = "python -m build"
4047

4148
[tool.coverage.run]
4249
source = ["django_object_actions"]

0 commit comments

Comments
 (0)