diff options
| -rw-r--r-- | license_protected_downloads/bzr_version.py | 15 | ||||
| -rw-r--r-- | license_protected_downloads/tests/test_views.py | 9 | ||||
| -rw-r--r-- | license_protected_downloads/views.py | 7 | ||||
| -rw-r--r-- | settings.py | 2 | ||||
| -rw-r--r-- | templates_releases/header.html | 2 | ||||
| -rw-r--r-- | version.py | 1 |
6 files changed, 7 insertions, 29 deletions
diff --git a/license_protected_downloads/bzr_version.py b/license_protected_downloads/bzr_version.py deleted file mode 100644 index 93c47b2..0000000 --- a/license_protected_downloads/bzr_version.py +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2012 Linaro. -# -# Gets a bzr revision number for the directory this file lives in. -# - -import bzrlib.branch -import os.path - - -def get_my_bzr_revno(): - """Returns a bzr revision number for the directory this file lives in.""" - branch_dir = os.path.join(os.path.dirname(__file__), '..') - branch = bzrlib.branch.Branch.open(branch_dir) - revision_info = branch.last_revision_info() - return revision_info[0] diff --git a/license_protected_downloads/tests/test_views.py b/license_protected_downloads/tests/test_views.py index 85fc8ec..3096de8 100644 --- a/license_protected_downloads/tests/test_views.py +++ b/license_protected_downloads/tests/test_views.py @@ -491,15 +491,6 @@ class ViewTests(BaseServeViewTest): self.assertContains(response, r"Welcome to the Linaro releases server") - def test_revision_in_header(self): - response = self.client.get("http://testserver/", follow=True) - - self.assertContains(response, - (r'Running ' - r'<a href="https://launchpad.net/linaro-license-protection">' - r'lp:linaro-license-protection</a> r' + - str(bzr_version.get_my_bzr_revno()))) - def test_exception_internal_host_for_lic(self): internal_host = INTERNAL_HOSTS[0] target_file = 'build-info/origen-blob.txt' diff --git a/license_protected_downloads/views.py b/license_protected_downloads/views.py index 02d3eac..0bd690b 100644 --- a/license_protected_downloads/views.py +++ b/license_protected_downloads/views.py @@ -21,7 +21,6 @@ from django.template import RequestContext from django.utils.encoding import smart_str, iri_to_uri from django.views.decorators.csrf import csrf_exempt -import bzr_version from buildinfo import BuildInfo, IncorrectDataFormatException from render_text_files import RenderTextFiles from models import License, APIKeyStore @@ -379,7 +378,7 @@ def show_license(request): return render_to_response('licenses/' + lic.theme + '.html', {'license': lic, 'url': request.GET['url'], - 'revno': bzr_version.get_my_bzr_revno(), + 'revno': settings.VERSION, }, context_instance=RequestContext(request)) @@ -447,7 +446,7 @@ def group_auth_failed_response(request, auth_groups): {'login': settings.LOGIN_URL + "?next=" + request.path, 'authenticated': request.user.is_authenticated(), 'groups_string': groups_string, - 'revno': bzr_version.get_my_bzr_revno(), + 'revno': settings.VERSION, }) response.status_code = 403 @@ -539,7 +538,7 @@ def file_server_get(request, path): {'dirlist': dir_list(url, path), 'up_dir': up_dir, 'dl': download, - 'revno': bzr_version.get_my_bzr_revno(), + 'revno': settings.VERSION, 'header_content': header_content, 'request': request, 'rendered_files': rendered_files diff --git a/settings.py b/settings.py index 3741661..791d6f9 100644 --- a/settings.py +++ b/settings.py @@ -2,6 +2,8 @@ import os +from version import * + DEBUG = True TEMPLATE_DEBUG = DEBUG diff --git a/templates_releases/header.html b/templates_releases/header.html index 9c8de13..7fd0bb7 100644 --- a/templates_releases/header.html +++ b/templates_releases/header.html @@ -34,7 +34,7 @@ {% block content %}{% endblock %} </div> <div id="footer"> - Running <a href="https://launchpad.net/linaro-license-protection">lp:linaro-license-protection</a> r{{ revno }}. + Running <a href="https://git.linaro.org/infrastructure/linaro-license-protection.git">linaro-license-protection</a> {{ revno }}. </div> </body> </html> diff --git a/version.py b/version.py new file mode 100644 index 0000000..64d15ad --- /dev/null +++ b/version.py @@ -0,0 +1 @@ +VERSION = '2014.05' |