innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[2.2.x] Refs #30948 -- Updated install instructions to use pip instead of setup.py. 

Co-authored-by: Nick Pope <nick.pope@flightdataservices.com>

Backport of eee4da3b57 from master
This commit is contained in:
Jon Dufresne 2019-11-07 15:51:02 +01:00 committed by Mariusz Felisiak
parent a2305a0c0a
commit 3627fc5ee6
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
INSTALL
View File

@ -3,8 +3,6 @@ Thanks for downloading Django.
To install it, make sure you have Python 3.5 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.

6
docs/faq/troubleshooting.txt
View File

@ -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`.

4
docs/ref/django-admin.txt
View File

@ -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