Skip to content

Commit 9731962

Browse files
committed
Migrating to new .toml config.
1 parent 9de3d58 commit 9731962

26 files changed

+1359
-1245
lines changed

.gitignore

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
*.pyc
2-
__pycache__
3-
.idea/
4-
build/
5-
dist/
6-
recodex_monitor.egg-info/
7-
docs/*
8-
!docs/index.rst
9-
!docs/Makefile
10-
!docs/conf.py
11-
MANIFEST
12-
1+
*.pyc
2+
__pycache__
3+
.idea/
4+
build/
5+
dist/
6+
recodex_monitor.egg-info/
7+
docs/*
8+
!docs/index.rst
9+
!docs/Makefile
10+
!docs/conf.py
11+
MANIFEST
12+
13+
/.vscode

BUILD.md

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Build Instructions
2+
3+
This project has been converted from the old `setup.py` style to the modern `pyproject.toml` configuration.
4+
5+
## Building the Package
6+
7+
### Using pip (recommended)
8+
```bash
9+
pip install build
10+
python -m build
11+
```
12+
13+
### Using setuptools directly
14+
```bash
15+
python setup.py sdist bdist_wheel
16+
```
17+
18+
### Installing in development mode
19+
```bash
20+
pip install -e .
21+
```
22+
23+
## RPM Package Building
24+
25+
The `.spec` file has been updated to work with the new build system:
26+
27+
```bash
28+
rpmbuild -ba recodex-monitor.spec
29+
```
30+
31+
## Changes Made
32+
33+
1. **Created `pyproject.toml`** - Modern Python packaging configuration
34+
2. **Updated `setup.py`** - Now defers to `pyproject.toml` for backward compatibility
35+
3. **Created `setup.cfg`** - Additional configuration file (optional)
36+
4. **Updated `recodex-monitor.spec`** - Modified to work with wheel-based builds
37+
5. **Updated `requirements.txt`** - Cleaned up dependencies
38+
39+
## Migration Notes
40+
41+
- Version is now dynamically read from `monitor.__version__`
42+
- All package metadata is centralized in `pyproject.toml`
43+
- The build process now creates modern wheel packages
44+
- RPM packaging uses wheel installation instead of direct setup.py

LICENSE

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
The MIT License (MIT)
2-
3-
Copyright (c) 2016 ReCodEx Team
4-
5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
11-
12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
14-
15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
22-
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2016 ReCodEx Team
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.
22+

README.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ tab of monitor GitHub repository (it is architecture independent package)
8989
- Other Linux distributions can install monitor by calling setup directly...
9090

9191
.. code:: bash
92+
9293
~$ python3 setup.py install --install-scripts /usr/bin
9394
~# ./install/postinst
9495

0 commit comments

Comments
 (0)