Skip to content

Commit 2d62054

Browse files
committed
Merge setup.py into pyproject.toml.
1 parent ef08aba commit 2d62054

File tree

5 files changed

+86
-66
lines changed

5 files changed

+86
-66
lines changed

.github/workflows/main.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
python-version: ${{matrix.python-version}}
2828
cache: pip
2929
- run: pip install -r requirements.txt
30-
- run: ruff check setup.py src/moulti
30+
- run: ruff check src/moulti
3131
- run: mypy src/moulti
3232
- run: pylint src/moulti
3333
- run: ruff check tests

container/demo/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
FROM debian:stable-20240211-slim
22

33
# Install Moulti:
4-
COPY README.md pyproject.toml setup.py /tmp/moulti
4+
COPY LICENSE pyproject.toml /tmp/moulti
55
COPY examples /tmp/moulti/examples
6-
COPY src/moulti /tmp/moulti/src/moulti
6+
COPY src /tmp/moulti/src
77
ENV PIPX_HOME=/opt/pipx PIPX_BIN_DIR=/usr/local/bin PIPX_MAN_DIR=/usr/local/share/man
88
RUN unlink /etc/apt/apt.conf.d/docker-clean && \
99
apt update && \

examples/moulti-python-checks.bash

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ moulti step add versions --title='Versions' --bottom-text=' '
1616
pytest --version
1717
} 2>&1 | moulti pass versions
1818

19-
moulti_exec ruff check setup.py src
19+
moulti_exec ruff check src
2020
moulti_exec mypy src
2121
moulti_exec pylint src
2222
moulti_exec pytest

pyproject.toml

+82
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,88 @@
22
requires = ["setuptools", "wheel"]
33
build-backend = "setuptools.build_meta"
44

5+
[project]
6+
name = "moulti"
7+
version = "1.29.0"
8+
dependencies = [
9+
'argcomplete',
10+
'pyperclip',
11+
'textual==1.0.*',
12+
'unidiff',
13+
]
14+
requires-python = ">= 3.10"
15+
authors = [
16+
{ name = "Xavier G.", email = "[email protected]" },
17+
]
18+
description = """\
19+
Moulti is a CLI-driven Terminal User Interface (TUI) displaying \
20+
arbitrary outputs inside visual, collapsible blocks called steps.\
21+
"""
22+
readme = "README.md"
23+
license = { "file" = "LICENSE" }
24+
keywords = [
25+
"ansible",
26+
"cli",
27+
"collapsible",
28+
"curses",
29+
"diff",
30+
"multiplex",
31+
"output",
32+
"script",
33+
"steps",
34+
"terminal",
35+
"textual",
36+
"tui",
37+
]
38+
classifiers = [
39+
"Environment :: Console :: Curses",
40+
"Intended Audience :: Developers",
41+
"Intended Audience :: System Administrators",
42+
"License :: OSI Approved :: MIT License",
43+
"Operating System :: MacOS :: MacOS X",
44+
"Operating System :: POSIX :: BSD :: FreeBSD",
45+
"Operating System :: POSIX :: BSD :: NetBSD",
46+
"Operating System :: POSIX :: BSD :: OpenBSD",
47+
"Operating System :: POSIX :: Linux",
48+
"Programming Language :: Python :: 3 :: Only",
49+
"Topic :: System :: Logging",
50+
"Topic :: Utilities",
51+
]
52+
53+
[project.urls]
54+
Homepage = "https://github.com/xavierog/moulti/?tab=readme-ov-file#moulti"
55+
Documentation = "https://github.com/xavierog/moulti/blob/master/Documentation.md"
56+
Repository = "https://github.com/xavierog/moulti.git"
57+
Issues = "https://github.com/xavierog/moulti/issues"
58+
Changelog = "https://github.com/xavierog/moulti/blob/master/CHANGELOG.md"
59+
60+
[project.scripts]
61+
moulti = "moulti.precli:main"
62+
moulti-askpass = "moulti.askpass:main"
63+
moulti-askpass-become-password = "moulti.askpass:main"
64+
moulti-askpass-connection-password = "moulti.askpass:main"
65+
moulti-askpass-vault-client = "moulti.askpass:main"
66+
67+
[tool.setuptools]
68+
package-dir = { "" = "src" }
69+
packages = [
70+
"moulti",
71+
"moulti.ansible",
72+
"moulti.widgets",
73+
"moulti.widgets.abstractquestion",
74+
"moulti.widgets.abstractstep",
75+
"moulti.widgets.buttonquestion",
76+
"moulti.widgets.collapsiblestep",
77+
"moulti.widgets.divider",
78+
"moulti.widgets.inputquestion",
79+
"moulti.widgets.question",
80+
"moulti.widgets.step",
81+
]
82+
script-files = [
83+
"examples/moulti-functions.bash",
84+
"examples/moulti-man",
85+
]
86+
587
[tool.ruff]
688
line-length = 120
789

setup.py

-62
This file was deleted.

0 commit comments

Comments
 (0)