Skip to content

Commit d218d52

Browse files
scivisionjpakkane
authored andcommitted
Ensure setuptools via PEP508/518 pyproject.toml
1 parent 48e6db8 commit d218d52

File tree

5 files changed

+21
-11
lines changed

5 files changed

+21
-11
lines changed

README.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,11 @@ build system.
2222

2323
You can run Meson directly from a revision control checkout or an
2424
extracted tarball. If you wish you can install it locally with the
25-
standard Python distutils command `python3 setup.py install <your
26-
options here>`.
25+
standard Python command
26+
27+
```sh
28+
python3 -m pip install meson <your options here>
29+
```
2730

2831
Meson is also available from
2932
[PyPi](https://pypi.python.org/pypi/meson), so it can be installed

docs/markdown/Quick-guide.md

+10-8
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ short-description: Getting Started using Mesonbuild
77

88
Meson has been designed to be as simple to use as possible. This page
99
outlines the initial steps needed for installation, troubleshooting,
10-
and standard use.
10+
and standard use.
1111

12-
For more advanced configuration please refer to the command line help `meson --help`
12+
For more advanced configuration please refer to the command line help `meson --help`
1313
or the Meson documentation located at the [Mesonbuild](https://mesonbuild.com) website.
1414

1515
Table of Contents:
@@ -40,23 +40,25 @@ Ubuntu:
4040
$ sudo apt-get install python3 python3-pip python3-setuptools \
4141
python3-wheel ninja-build
4242
```
43-
*Due to our frequent release cycle and development speed, distro packaged software may quickly become outdated.*
43+
*Due to our frequent release cycle and development speed, distro packaged software may quickly become outdated.*
4444

4545
Installation using Python
4646
--
47-
Requirements: **pip3**
47+
Requirements: **pip3**
4848

49-
The best way to receive the most up-to-date version of Mesonbuild.
49+
The best way to receive the most up-to-date version of Mesonbuild.
5050

5151
Install as a local user (recommended):
5252
```console
5353
$ pip3 install --user meson
5454
```
55-
Install as root:
55+
Install as root:
5656
```console
5757
$ pip3 install meson
5858
```
59-
*If you are unsure whether to install as root or a local user, install as a local user.*
59+
60+
*If you are unsure whether to install as root or a local user, install as a local user.*
61+
6062

6163
Installation from source
6264
--
@@ -76,7 +78,7 @@ $ bash: /usr/bin/meson: No such file or directory
7678
```
7779
Description: The default installation prefix for the python pip module installation is not included in your shell environment PATH. The default prefix for python pip installation modules is located under ``/usr/local``.
7880

79-
**Resolution:
81+
**Resolution:
8082
This issue can be resolved by altering the default shell environment PATH to include ``/usr/local/bin``. **
8183

8284
*Note: There are other ways of fixing this issue such as using symlinks or copying the binaries to a default path and these methods are not recommended or supported as they may break package management interoperability.*

pyproject.toml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[build-system]
2+
requires = ["setuptools", "wheel"]

setup.cfg

+4
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,7 @@ long_description = Meson is a cross-platform build system designed to be both as
3030

3131
[options]
3232
python_requires = >= 3.5.2
33+
34+
[options.extras_require]
35+
progress =
36+
tqdm

setup.py

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
if __name__ == '__main__':
5050
setup(name='meson',
5151
version=version,
52-
extras_require={'progress': ['tqdm']},
5352
packages=packages,
5453
package_data=package_data,
5554
entry_points=entries,

0 commit comments

Comments
 (0)