Skip to content

Commit

Permalink
Refs #30948 -- Updated install instructions to use pip instead of set…
Browse files Browse the repository at this point in the history
…up.py.

Co-authored-by: Nick Pope <nick.pope@flightdataservices.com>
  • Loading branch information
2 people authored and felixxm committed Nov 8, 2019
1 parent a32f983 commit eee4da3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
4 changes: 1 addition & 3 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -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.
6 changes: 3 additions & 3 deletions docs/faq/troubleshooting.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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`.

Expand Down
4 changes: 2 additions & 2 deletions docs/ref/django-admin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit eee4da3

Please sign in to comment.