Skip to content
Draft
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
5 changes: 1 addition & 4 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ jobs:
- name: Install Python dependencies
run: |
./venv/bin/python -m pip install --upgrade pip
./venv/bin/python -m pip install -r requirements-dev.txt
- name: Install package manager dependencies
run: |
sudo apt-get update
Expand Down Expand Up @@ -210,13 +209,12 @@ jobs:
- name: Install Python dependencies
run: |
./venv/bin/python -m pip install --upgrade pip
./venv/bin/python -m pip install -r requirements-dev.txt
- name: Set up dependencies
run:
sudo apt-get install clang-format
- name: Install Package
run: |
./venv/bin/python -m pip install -e .
./venv/bin/python -m pip install -e ".[dev]"
env:
PREFIX: blazingmq_artifacts
PYTHON: ./venv/bin/python
Expand Down Expand Up @@ -260,7 +258,6 @@ jobs:
- name: Install Python dependencies
run: |
./venv/bin/python3 -m pip install --upgrade pip
./venv/bin/python3 -m pip install -r requirements-dev.txt
- name: Setup Core Dumps config
run: |
sudo mkdir /cores
Expand Down
8 changes: 3 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,11 @@ install-sdist: dist

.PHONY: coverage-install
coverage-install:
$(ENV) CYTHON_TEST_MACROS=1 $(PIP_INSTALL) -r requirements-test-coverage.txt
$(ENV) CYTHON_TEST_MACROS=1 $(PIP_INSTALL) -e .
$(ENV) CYTHON_TEST_MACROS=1 $(PIP_INSTALL) -e ".[coverage]"

.PHONY: test-install
test-install:
$(ENV) CYTHON_TEST_MACROS=1 $(PIP_INSTALL) -r requirements-test.txt
$(ENV) CYTHON_TEST_MACROS=1 $(PIP_INSTALL) -e .
$(ENV) CYTHON_TEST_MACROS=1 $(PIP_INSTALL) -e ".[test]"

.PHONY: build
build:
Expand All @@ -64,7 +62,7 @@ dist:

.PHONY: doc-deps
doc-deps:
$(PIP_INSTALL) -r requirements-lint-docs.txt
$(PIP_INSTALL) -e ".[docs]"

.PHONY: docs
docs:
Expand Down
2 changes: 1 addition & 1 deletion docs/BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Additional `make` targets are provided, such as for test coverage.
Dependencies for these can be installed as follows:

```shell
python3.9 -m pip install -r requirements-dev.txt
python3.9 -m pip install -e ".[dev]"
```

And now you should be able to run `make coverage`.
Expand Down
1 change: 1 addition & 0 deletions news/77.misc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Move development dependencies from ``requirements*.txt`` files into ``pyproject.toml`` optional-dependencies.
30 changes: 30 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,36 @@ classifiers = [
"Typing :: Typed",
]

[project.optional-dependencies]
test = [
"mock",
"pytest",
"pkgconfig",
]
coverage = [
"blazingmq[test]",
"pytest-cov",
"Cython>=3,<4",
]
lint = [
"black",
"flake8",
"isort",
"mypy",
"types-enum34",
]
docs = [
"recommonmark",
"Sphinx",
"sphinx_rtd_theme",
"towncrier",
]
dev = [
"blazingmq[test,coverage,lint,docs]",
"tox",
"setuptools",
]

[tool.setuptools]
packages = ["blazingmq"]
package-dir = {"" = "src"}
Expand Down
5 changes: 0 additions & 5 deletions requirements-dev.txt

This file was deleted.

9 changes: 0 additions & 9 deletions requirements-lint-docs.txt

This file was deleted.

4 changes: 0 additions & 4 deletions requirements-test-coverage.txt

This file was deleted.

3 changes: 0 additions & 3 deletions requirements-test.txt

This file was deleted.

6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ whitelist_externals = make

deps =
pip>=19.0.3
-rrequirements-test.txt
extras = test

commands =
{basepython} -c 'import sys; print("\n".join(sys.path))'
Expand All @@ -37,7 +37,7 @@ basepython = python3.14
[testenv:py314-cov]
usedevelop = True
commands = {[testenv]commands_cov}
deps = -rrequirements-test-coverage.txt
extras = coverage

[testenv:lint]
description = Run lint checker on Python files
Expand Down Expand Up @@ -71,6 +71,6 @@ commands = {basepython} -m black --check --verbose src tests
[testenv:docs]
description = Generate library documentation
basepython = python3.14
deps = -rrequirements-lint-docs.txt
extras = docs
commands = make -C docs html
{basepython} -c 'print("documentation available under file://{toxworkdir}/docs_out/index.html")'
Loading