diff options
| author | Jon Dufresne <jon.dufresne@gmail.com> | 2019-11-07 15:51:02 +0100 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2019-11-08 21:16:52 +0100 |
| commit | bca2ffd3c267fecbcfb683a853f350959afee553 (patch) | |
| tree | 8e85018607703b68c768e0cce78b215276a3ff6e | |
| parent | 48631a1afd4d1b9ed999e99427d8e55a6a2e997e (diff) | |
[3.0.x] Refs #30948 -- Updated install instructions to use pip instead of setup.py.
Co-authored-by: Nick Pope <nick.pope@flightdataservices.com>
Backport of eee4da3b5748370a5c562bc63d2cae61ea85b16c from master
| -rw-r--r-- | INSTALL | 4 | ||||
| -rw-r--r-- | docs/faq/troubleshooting.txt | 6 | ||||
| -rw-r--r-- | docs/ref/django-admin.txt | 4 |
3 files changed, 6 insertions, 8 deletions
@@ -3,8 +3,6 @@ Thanks for downloading Django. To install it, make sure you have Python 3.6 or greater installed. Then run this command from the command prompt: - python setup.py install - -If you're upgrading from a previous version, you need to remove it first. + python -m pip install . For more detailed instructions, see docs/intro/install.txt. diff --git a/docs/faq/troubleshooting.txt b/docs/faq/troubleshooting.txt index ba44aa83ef..f90d0e8e6e 100644 --- a/docs/faq/troubleshooting.txt +++ b/docs/faq/troubleshooting.txt @@ -14,9 +14,9 @@ Problems running ``django-admin`` ----------------------------------- :doc:`django-admin </ref/django-admin>` should be on your system path if you -installed Django via ``python setup.py``. If it's not on your path, you can -find it in ``site-packages/django/bin``, where ``site-packages`` is a directory -within your Python installation. Consider symlinking to :doc:`django-admin +installed Django via ``pip``. If it's not on your path, you can find it in +``site-packages/django/bin``, where ``site-packages`` is a directory within +your Python installation. Consider symlinking to :doc:`django-admin </ref/django-admin>` from some place on your path, such as :file:`/usr/local/bin`. diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index 7675dbc0d9..fbea71e6e6 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -11,8 +11,8 @@ does the same thing as ``django-admin`` but also sets the project's ``settings.py`` file. The ``django-admin`` script should be on your system path if you installed -Django via its ``setup.py`` utility. If it's not on your path, you can find it -in ``site-packages/django/bin`` within your Python installation. Consider +Django via ``pip``. If it's not on your path, you can find it in +``site-packages/django/bin`` within your Python installation. Consider symlinking it from some place on your path, such as ``/usr/local/bin``. For Windows users, who do not have symlinking functionality available, you can |