diff --git a/README.md b/README.md index 5a083ab50..175e7f6a1 100644 --- a/README.md +++ b/README.md @@ -22,8 +22,11 @@ build system. You can run Meson directly from a revision control checkout or an extracted tarball. If you wish you can install it locally with the -standard Python distutils command `python3 setup.py install `. +standard Python command + +```sh +python3 -m pip install meson +``` Meson is also available from [PyPi](https://pypi.python.org/pypi/meson), so it can be installed diff --git a/docs/markdown/Quick-guide.md b/docs/markdown/Quick-guide.md index 80d37401d..0bed6832e 100644 --- a/docs/markdown/Quick-guide.md +++ b/docs/markdown/Quick-guide.md @@ -7,9 +7,9 @@ short-description: Getting Started using Mesonbuild Meson has been designed to be as simple to use as possible. This page outlines the initial steps needed for installation, troubleshooting, -and standard use. +and standard use. -For more advanced configuration please refer to the command line help `meson --help` +For more advanced configuration please refer to the command line help `meson --help` or the Meson documentation located at the [Mesonbuild](https://mesonbuild.com) website. Table of Contents: @@ -40,23 +40,25 @@ Ubuntu: $ sudo apt-get install python3 python3-pip python3-setuptools \ python3-wheel ninja-build ``` -*Due to our frequent release cycle and development speed, distro packaged software may quickly become outdated.* +*Due to our frequent release cycle and development speed, distro packaged software may quickly become outdated.* Installation using Python -- -Requirements: **pip3** +Requirements: **pip3** -The best way to receive the most up-to-date version of Mesonbuild. +The best way to receive the most up-to-date version of Mesonbuild. Install as a local user (recommended): ```console $ pip3 install --user meson ``` -Install as root: +Install as root: ```console $ pip3 install meson ``` -*If you are unsure whether to install as root or a local user, install as a local user.* + +*If you are unsure whether to install as root or a local user, install as a local user.* + Installation from source -- @@ -76,7 +78,7 @@ $ bash: /usr/bin/meson: No such file or directory ``` 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``. -**Resolution: +**Resolution: This issue can be resolved by altering the default shell environment PATH to include ``/usr/local/bin``. ** *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.* diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 000000000..d1e6ae6e5 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,2 @@ +[build-system] +requires = ["setuptools", "wheel"] diff --git a/setup.cfg b/setup.cfg index 0b6c813bb..33ab5f7dd 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,3 +30,7 @@ long_description = Meson is a cross-platform build system designed to be both as [options] python_requires = >= 3.5.2 + +[options.extras_require] +progress = + tqdm \ No newline at end of file diff --git a/setup.py b/setup.py index 7d18afac0..166f480e3 100644 --- a/setup.py +++ b/setup.py @@ -49,7 +49,6 @@ if sys.platform != 'win32': if __name__ == '__main__': setup(name='meson', version=version, - extras_require={'progress': ['tqdm']}, packages=packages, package_data=package_data, entry_points=entries,