Skip to content

Commit 39655cc

Browse files
committed
Merge requirements.txt into pyproject.toml.
1 parent 2d62054 commit 39655cc

File tree

6 files changed

+41
-39
lines changed

6 files changed

+41
-39
lines changed

.github/workflows/freebsd.yaml

+1-7
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,10 @@ jobs:
2121
python3.11 -m venv .venv
2222
. .venv/bin/activate
2323
pip install --upgrade pip
24-
# Remove problematic python packages:
25-
# - bpython: unnecessary, depends on greenlet and thus on a recent C++ compiler
26-
# - ruff: depends on a Rust compiler
27-
# - twine: unnecessary, depends on a Rust compiler
28-
sed -i '' '/bpython/d; /ruff/d; /twine/d' requirements.txt
29-
pip install -r requirements.txt
24+
pip install -e .[bsd-ci]
3025
# no ruff, no ruff check
3126
mypy src/moulti
3227
pylint src/moulti
33-
pip install -e .
3428
# This runs all tests except:
3529
# - test_diff_with_delta (requires delta 0.18.x)
3630
pytest -v

.github/workflows/main.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,11 @@ jobs:
2626
with:
2727
python-version: ${{matrix.python-version}}
2828
cache: pip
29-
- run: pip install -r requirements.txt
29+
- run: pip install -e .[ci]
3030
- run: ruff check src/moulti
3131
- run: mypy src/moulti
3232
- run: pylint src/moulti
3333
- run: ruff check tests
34-
- run: pip install -e .
3534
# This runs all tests except:
3635
# - test_diff_with_delta (requires delta 0.18.x)
3736
- run: pytest -v

.github/workflows/netbsd.yaml

+1-7
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,10 @@ jobs:
2424
python3.11 -m venv .venv
2525
. .venv/bin/activate
2626
pip install --upgrade pip
27-
# Remove problematic python packages:
28-
# - bpython: unnecessary, depends on greenlet and thus on a recent C++ compiler
29-
# - ruff: depends on a Rust compiler
30-
# - twine: unnecessary, depends on a Rust compiler
31-
sed -i '/bpython/d; /ruff/d; /twine/d' requirements.txt
32-
pip install -r requirements.txt
27+
pip install -e .[bsd-ci]
3328
# no ruff, no ruff check
3429
mypy src/moulti
3530
pylint src/moulti
36-
pip install -e .
3731
# This runs all tests except:
3832
# - test_diff_with_delta (requires delta 0.18.x)
3933
pytest -v

.github/workflows/openbsd.yaml

+1-7
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,10 @@ jobs:
2121
python3.11 -m venv .venv
2222
. .venv/bin/activate
2323
pip install --upgrade pip
24-
# Remove problematic python packages:
25-
# - bpython: unnecessary, depends on greenlet and thus on a recent C++ compiler
26-
# - ruff: depends on a Rust compiler
27-
# - twine: unnecessary, depends on a Rust compiler
28-
sed -i '/bpython/d; /ruff/d; /twine/d' requirements.txt
29-
pip install -r requirements.txt
24+
pip install -e .[bsd-ci]
3025
# no ruff, no ruff check
3126
mypy src/moulti
3227
pylint src/moulti
33-
pip install -e .
3428
# This runs all tests except:
3529
# - test_diff_with_delta (requires delta 0.18.x)
3630
pytest -v

pyproject.toml

+37
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,43 @@ classifiers = [
5050
"Topic :: Utilities",
5151
]
5252

53+
[project.optional-dependencies]
54+
tinker = [
55+
"bpython",
56+
"textual-dev",
57+
]
58+
check-py = [
59+
"mypy",
60+
"pylint",
61+
]
62+
check-rust = [
63+
"ruff",
64+
]
65+
check = [
66+
"moulti[check-py,check-rust]",
67+
]
68+
test = [
69+
"pytest",
70+
"pytest-asyncio",
71+
"pytest-forked",
72+
"pytest-textual-snapshot @ git+https://github.com/textualize/pytest-textual-snapshot@19b2607c93b898cc67c6f9299f6236af5e994375",
73+
"pytest-xdist",
74+
]
75+
release = [
76+
"build",
77+
"twine",
78+
]
79+
dev = [
80+
"moulti[tinker,check,test,release]",
81+
]
82+
ci = [
83+
"moulti[check,test]",
84+
]
85+
# Installing ruff on *BSD systems requires a Rust compiler + time + energy:
86+
bsd-ci = [
87+
"moulti[check-py,test]",
88+
]
89+
5390
[project.urls]
5491
Homepage = "https://github.com/xavierog/moulti/?tab=readme-ov-file#moulti"
5592
Documentation = "https://github.com/xavierog/moulti/blob/master/Documentation.md"

requirements.txt

-16
This file was deleted.

0 commit comments

Comments
 (0)