Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #22235 -- recommend pip install from url

  • Loading branch information...
commit 11562ec114a7a94c8e979bbe90111c7964b5cb7a 1 parent 2b00acb
@arachnegl arachnegl authored bmispelon committed
Showing with 5 additions and 12 deletions.
  1. +2 −0  releases/views.py
  2. +3 −12 templates/releases/download.html
View
2  releases/views.py
@@ -1,5 +1,6 @@
from __future__ import absolute_import, unicode_literals
+from django.contrib.sites.shortcuts import get_current_site
from django.http import HttpResponsePermanentRedirect, Http404
from django.shortcuts import get_object_or_404, render
@@ -45,6 +46,7 @@ def index(request):
'earlier_versions': [release.version for release in reversed(releases) if release != lts],
'preview_version': preview_version,
'preview_kind': preview_kind,
+ 'site': get_current_site(request),
}
return render(request, 'releases/download.html', context)
View
15 templates/releases/download.html
@@ -21,24 +21,15 @@
<pre class="literal-block"><code>pip install Django=={{ current_version }}</code></pre>
-<p>You can also get it by direct download:</p>
-
-<p>First, download <a href="{% url 'download-redirect' current_version 'tarball' %}">Django-{{ current_version }}.tar.gz</a> (<a href="{% url 'download-redirect' current_version 'checksum' %}">checksums</a>). Then:</p>
-
-<pre class="literal-block"><code>tar xzvf Django-{{ current_version }}.tar.gz
-cd Django-{{ current_version }}
-sudo python setup.py install</code></pre>
-
{% if preview_version %}
<h2>Option {% cycle options %}. Get the {{ preview_kind }} for {{ preview_version|slice:":3" }}</h2>
<p>As part of the Django {{ preview_version|slice:":3" }} development process, Django {{ preview_version }} is available. This release is only for experienced users who want to try out the new version and help identify any remaining bugs prior to the {{ preview_version|slice:":3" }} release. Please read the {{ preview_version|slice:":3" }} release notes before using this package.
-<p>To try out the {{ preview_kind }}, download <a href="{% url 'download-redirect' preview_version 'tarball' %}">Django-{{ preview_version }}.tar.gz</a> (<a href="{% url 'download-redirect' preview_version 'checksum' %}">checksums</a>). Then:</p>
+<p>To try out the {{ preview_kind }}, you can install it with <a href="http://www.pip-installer.org/en/latest/">pip</a>:</p>
+
+<pre class="literal-block"><code>pip install https://{{ site.domain }}{% url 'download-redirect' preview_version 'tarball' %}</code></pre>
-<pre class="literal-block"><code>tar xzvf Django-{{ preview_version }}.tar.gz
-cd Django-{{ preview_version }}
-sudo python setup.py install</code></pre>
{% endif %}
<h2>Option {% cycle options %}. Get the latest development version</h2>
Please sign in to comment.
Something went wrong with that request. Please try again.