Merge lp:~mhall119/developer-ubuntu-com/apidoc-frameworks-creation into lp:developer-ubuntu-com

[Michael Hall]

Updates to make it easier to manage new framework releases

Updates to make it easier to manage new framework releases
 * Change importers to allow targeting version aliases (development & current)
 * Add clone methods to API docs models
 * Add "New Release" link to development version page (only for admins)
 * Add page for defining the new development version name

[Michael Hall (mhall119)]

To test, you will need existing API docs with a version marked as the "development" version for a language. Then log in using an account with admin access and navigate to that version's page, you should see a link in the upper-right marked "New Release". Clicking that will take you to a page where you can define the name of the new version, and submitting that will copy the contents from the previous "development" version into the new one, mark the old one as "current" and the new one as "development"

[Daniel Holbach (dholbach)]

Looks good to me.

review: Approve

=== modified file 'api_docs/admin.py'
--- api_docs/admin.py	2015-02-05 14:24:04 +0000
+++ api_docs/admin.py	2016-02-24 17:45:37 +0000
@@ -7,7 +7,7 @@
 admin.site.register(Topic, TopicAdmin)
 
 class LanguageAdmin(admin.ModelAdmin):
-    list_display = ('name', 'slug', 'topic')
+    list_display = ('name', 'slug', 'topic', 'current_version', 'development_version')
     list_filter = ('topic',)
     search_fields = ('name', 'slug')
 admin.site.register(Language, LanguageAdmin)

=== modified file 'api_docs/management/commands/import_cordova.py'
--- api_docs/management/commands/import_cordova.py	2015-02-17 20:14:09 +0000
+++ api_docs/management/commands/import_cordova.py	2016-02-24 17:45:37 +0000
@@ -51,7 +51,12 @@
         verbosity = int(options.get('verbosity', 0))
         topic = Topic.objects.get(slug=options.get('topic'))
         language = Language.objects.get(slug=options.get('lang'), topic=topic)
-        version = Version.objects.get(slug=options.get('version'), language=language)
+        if options.get('version') == 'development':
+            version = language.development_version
+        elif options.get('version') == 'current':
+            version = language.current_version
+        else:
+            version = Version.objects.get(slug=options.get('version'), language=language)
         section = None # Determined at runtime
         
         importer = CordovaImporter(topic, language, version, section, options)

=== modified file 'api_docs/management/commands/import_doxygen.py'
--- api_docs/management/commands/import_doxygen.py	2015-02-17 20:14:09 +0000
+++ api_docs/management/commands/import_doxygen.py	2016-02-24 17:45:37 +0000
@@ -90,7 +90,12 @@
         verbosity = int(options.get('verbosity', 0))
         topic = Topic.objects.get(slug=options.get('topic'))
         language = Language.objects.get(slug=options.get('lang'), topic=topic)
-        version = Version.objects.get(slug=options.get('version'), language=language)
+        if options.get('version') == 'development':
+            version = language.development_version
+        elif options.get('version') == 'current':
+            version = language.current_version
+        else:
+            version = Version.objects.get(slug=options.get('version'), language=language)
         section = None # Will be determined during import
         
         importer = DoxygenImporter(topic, language, version, section, options)

=== modified file 'api_docs/management/commands/import_qdoc.py'
--- api_docs/management/commands/import_qdoc.py	2015-02-17 20:14:09 +0000
+++ api_docs/management/commands/import_qdoc.py	2016-02-24 17:45:37 +0000
@@ -83,7 +83,12 @@
         verbosity = int(options.get('verbosity', 0))
         topic = Topic.objects.get(slug=options.get('topic'))
         language = Language.objects.get(slug=options.get('lang'), topic=topic)
-        version = Version.objects.get(slug=options.get('version'), language=language)
+        if options.get('version') == 'development':
+            version = language.development_version
+        elif options.get('version') == 'current':
+            version = language.current_version
+        else:
+            version = Version.objects.get(slug=options.get('version'), language=language)
         section, created = Section.objects.get_or_create(name=options.get('section'), topic_version=version)
         
         importer = QDocImporter(topic, language, version, section, options)

=== modified file 'api_docs/management/commands/import_sphinx.py'
--- api_docs/management/commands/import_sphinx.py	2015-02-05 14:24:04 +0000
+++ api_docs/management/commands/import_sphinx.py	2016-02-24 17:45:37 +0000
@@ -90,7 +90,12 @@
         verbosity = int(options.get('verbosity', 0))
         topic = Topic.objects.get(slug=options.get('topic'))
         language = Language.objects.get(slug=options.get('lang'), topic=topic)
-        version = Version.objects.get(slug=options.get('version'), language=language)
+        if options.get('version') == 'development':
+            version = language.development_version
+        elif options.get('version') == 'current':
+            version = language.current_version
+        else:
+            version = Version.objects.get(slug=options.get('version'), language=language)
         section = None # Will be determined during import
         
         importer = SphinxImporter(topic, language, version, section, options)

=== modified file 'api_docs/management/commands/import_yuidoc.py'
--- api_docs/management/commands/import_yuidoc.py	2015-02-17 20:14:09 +0000
+++ api_docs/management/commands/import_yuidoc.py	2016-02-24 17:45:37 +0000
@@ -76,7 +76,12 @@
         verbosity = int(options.get('verbosity', 0))
         topic = Topic.objects.get(slug=options.get('topic'))
         language = Language.objects.get(slug=options.get('lang'), topic=topic)
-        version = Version.objects.get(slug=options.get('version'), language=language)
+        if options.get('version') == 'development':
+            version = language.development_version
+        elif options.get('version') == 'current':
+            version = language.current_version
+        else:
+            version = Version.objects.get(slug=options.get('version'), language=language)
         section, created = Section.objects.get_or_create(name=options.get('section'), topic_version=version)
         
         importer = YUIDocImporter(topic, language, version, section, options)

=== modified file 'api_docs/models.py'
--- api_docs/models.py	2015-02-26 15:26:20 +0000
+++ api_docs/models.py	2016-02-24 17:45:37 +0000
@@ -28,6 +28,10 @@
     name = models.CharField(max_length=64)
     slug = models.CharField(max_length=64)
 
+    def import_from(self, target_version):
+        for section in target_version.section_set.all():
+            self.section_set.add(section.clone())
+            
     def __unicode__(self):
         return self.language.topic.name +' '+self.language.name +' '+self.name
 
@@ -41,6 +45,28 @@
     def __unicode__(self):
         return self.topic_version.language.topic.name +' '+ self.topic_version.language.name +' '+self.topic_version.name+', '+self.name
 
+    def clone(self):
+        new = Section(name=self.name, description=self.description, topic_version=self.topic_version)
+        new.save()
+        for namespace in self.namespace_set.all():
+            new.namespace_set.add(namespace.clone(new))
+            
+        for element in self.element_set.all():
+            if not element.namespace:
+                element.section = new
+                element.id = None
+                element.save()
+                new.element_set.add(element)
+
+        for page in self.page_set.all():
+            if not page.namespace:
+                page.section = new
+                page.id = None
+                page.save()
+                new.page_set.add(page)
+
+        return new
+        
     @property
     def topic(self):
         return self.topic_version.topic
@@ -76,6 +102,26 @@
     def __unicode__(self):
         return u'%s' % self.name
         
+    def clone(self, new_section):
+        new = Namespace(name=self.name, display_name=self.display_name, data=self.data, source_file=self.source_file, source_format=self.source_format, platform_section=new_section)
+        new.save()
+
+        for element in self.element_set.all():
+            element.section = new_section
+            element.namespace = new
+            element.id = None
+            element.save()
+            new.element_set.add(element)
+
+        for page in self.page_set.all():
+            page.section = new_section
+            page.namespace = new
+            page.id = None
+            page.save()
+            new.page_set.add(page)
+
+        return new
+
     @property
     def display(self):
         if self.display_name:
@@ -137,11 +183,3 @@
     def __unicode__(self):
         return u'%s' % self.fullname
 
-#class DocSource(models.Model):
-    #'Source of API documentation'
-    #source_name = models.CharField(max_length=64, help_text='Unique name, processed in alphabetical order')
-    #source_url = models.UrlField(max_length=256, help_text='Publicly accessible download location')
-    #last_run = models.DateTime(auto_now=True)
-    #run_script = models.TextField(help_text='Script to run on package contents to import their docs')
-    #last_stdout = models.TextField(help_text='Output from the last run')
-    #last_stdeff = models.TextField(help_text='Errors from the last run')

=== modified file 'api_docs/templates/api_docs/version.html'
--- api_docs/templates/api_docs/version.html	2015-02-05 14:24:04 +0000
+++ api_docs/templates/api_docs/version.html	2016-02-24 17:45:37 +0000
@@ -9,6 +9,14 @@
 <li class="">{{version.name}}</li>
 {% endblock %}
 
+{% block nav_secondary %}
+    {% if perms.api_docs.add_version and version.language.development_version == version %}
+    <span style="float: right; vertical-align: middle;"><nav class="nav-secondary" style="border-bottom: 0px;"><ul><li><a href="{% url 'api_docs:release_version' language.topic.slug language.slug %}">New Release</a></li></ul></nav></span>
+    {% endif %}
+    {{block.super}}
+{% endblock nav_secondary%}
+
+
 {% block content %}
 	<div class="row">
     <h2>{{version.language.name}} {{version.language.topic.name}} for {{version.name}}</h2>

=== modified file 'api_docs/templates/api_docs/version_edit.html'
--- api_docs/templates/api_docs/version_edit.html	2015-02-05 14:24:04 +0000
+++ api_docs/templates/api_docs/version_edit.html	2016-02-24 17:45:37 +0000
@@ -1,23 +1,20 @@
-{% extends "api_docs/base.html" %}
+{% extends "base.html" %}
 
-{% block editor_links %}
-    <li><a href="{% url version_edit version.id %}?action=delete">Delete</a></li>
-{% endblock %}
+{% block title %}New Release - Ubuntu Developer{% endblock %}
 
 {% block breadcrumbs %}
 {% endblock %}
 
 {% block content %}
-{% if version.id %}
-<h2>Edit {{version.name}}</h2>
-{% else %}
+<div class="row">
 <h2>New Version</h2>
-{% endif %}
-
-<form action="" method="POST" id="element_form">
-{% csrf_token %}
-{{ form.as_p }}
-<input type="submit" value="Save">
-</form>
-
+<h3>(Previous version: {{ previous.slug }})</h3>
+    <div class="six-col">
+        <form action="" method="POST" id="element_form">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <input type="submit" value="Save">
+        </form>
+    </div>
+</div>
 {% endblock %}

=== modified file 'api_docs/urls.py'
--- api_docs/urls.py	2015-02-26 15:53:30 +0000
+++ api_docs/urls.py	2016-02-24 17:45:37 +0000
@@ -16,6 +16,7 @@
     url(r'^(?P<topic_name>[\w\.-]+)/$', 'api_docs.views.topic_view', name='topic'),
     url(r'^(?P<topic_name>[\w\.-]+)/(?P<language_name>[\w\.-]+)/$', 'api_docs.views.language_view', name='language'),
     url(r'^(?P<topic_name>[\w\.-]+)/(?P<language_name>[\w\.-]+)/(?P<release_version>[\w\.-]+)/$', 'api_docs.views.version_view', name='version'),
+    url(r'^(?P<topic_name>[\w\.-]+)/(?P<language_name>[\w\.-]+)/\+release/$', 'api_docs.views.release_version', name='release_version'),
     url(r'^(?P<topic_name>[\w\.-]+)/(?P<language_name>[\w\.-]+)/(?P<release_version>[\w\.-]+)/(?P<element_fullname>[\w\.\-\:]+)/$', 'api_docs.views.element_view', name='element'),
     
 )

=== modified file 'api_docs/views.py'
--- api_docs/views.py	2015-03-27 21:00:43 +0000
+++ api_docs/views.py	2016-02-24 17:45:37 +0000
@@ -52,6 +52,38 @@
     }
     return render_to_response('api_docs/language.html', context, RequestContext(request))
 
+from django.forms import ModelForm
+class VersionForm(ModelForm):
+    class Meta:
+        model = Version
+        fields = ['name', 'slug']
+
+def release_version(request, topic_name, language_name):
+    language = get_object_or_404(Language, topic__slug=topic_name, slug=language_name)
+
+    version = Version(language=language)
+
+    if request.method == 'POST':
+        form = VersionForm(request.POST, instance=version)
+        if form.is_valid():
+            form.save()
+            language.current_version = language.development_version
+            language.development_version = version
+            language.save()
+            version.import_from(language.current_version)
+            version.save()
+            return HttpResponseRedirect(reverse('api_docs:version', args=[topic_name, language_name, version.slug]))
+    else:
+        form = VersionForm(instance=version)
+        
+    context = {
+        'form': form,
+        'topic': language.topic,
+        'language': language,
+        'version': version,
+        'previous': language.development_version,
+    }
+    return render_to_response('api_docs/version_edit.html', context, RequestContext(request))
 
 def version_view(request, topic_name, language_name, release_version):
     version = _get_release_version(topic_name, language_name, release_version)

=== modified file 'update_apidocs.sh'
--- update_apidocs.sh	2016-01-11 15:33:54 +0000
+++ update_apidocs.sh	2016-02-24 17:45:37 +0000
@@ -2,113 +2,112 @@
 
 mkdir -p /tmp/apidoc_sources/
 
-##### SDK 15.04.1
 # Archives to download packages from
 export SERIES="vivid"
 
 #### Apps/QML
 ## QtQML & QtQuick
 ./get_package.py qtdeclarative5-doc-html
-python manage.py import_qdoc -p -t apps -l qml -r sdk-15.04.1 -s "Language Types" -N QtQml -i /tmp/apidoc_sources/usr/share/qt5/doc/qtqml/qtqml.index
-python manage.py import_qdoc -p -t apps -l qml -r sdk-15.04.1 -s "Graphical Interface" -n QtQuick -i /tmp/apidoc_sources/usr/share/qt5/doc/qtquick/qtquick.index
+python manage.py import_qdoc -p -t apps -l qml -r development -s "Language Types" -N QtQml -i /tmp/apidoc_sources/usr/share/qt5/doc/qtqml/qtqml.index
+python manage.py import_qdoc -p -t apps -l qml -r development -s "Graphical Interface" -n QtQuick -i /tmp/apidoc_sources/usr/share/qt5/doc/qtquick/qtquick.index
 
 ## QtMultimedia & QtAudioEngine
 ./get_package.py qtmultimedia5-doc-html
-python manage.py import_qdoc -p -t apps -l qml -r sdk-15.04.1 -s "Multimedia" -n QtMultimedia -i /tmp/apidoc_sources/usr/share/qt5/doc/qtmultimedia/qtmultimedia.index
+python manage.py import_qdoc -p -t apps -l qml -r development -s "Multimedia" -n QtMultimedia -i /tmp/apidoc_sources/usr/share/qt5/doc/qtmultimedia/qtmultimedia.index
 
 ## QtSensors
 ./get_package.py qtsensors5-doc-html
-python manage.py import_qdoc -p -t apps -l qml -r sdk-15.04.1 -s "Device and Sensors" -n QtSensors -i /tmp/apidoc_sources/usr/share/qt5/doc/qtsensors/qtsensors.index
+python manage.py import_qdoc -p -t apps -l qml -r development -s "Device and Sensors" -n QtSensors -i /tmp/apidoc_sources/usr/share/qt5/doc/qtsensors/qtsensors.index
 
 ## QtFeedback
 ./get_package.py qtfeedback5-doc-html
-python manage.py import_qdoc -t apps -l qml -r sdk-15.04.1 -s "Device and Sensors" -n QtFeedback -i /tmp/apidoc_sources/usr/share/qt5/doc/qtfeedback/qtfeedback.index
+python manage.py import_qdoc -t apps -l qml -r development -s "Device and Sensors" -n QtFeedback -i /tmp/apidoc_sources/usr/share/qt5/doc/qtfeedback/qtfeedback.index
 
 ## QtLocation
 ./get_package.py qtlocation5-doc-html
-python manage.py import_qdoc -p -t apps -l qml -r sdk-15.04.1 -s "Platform Services" -i /tmp/apidoc_sources/usr/share/qt5/doc/qtlocation/qtlocation.index
+python manage.py import_qdoc -p -t apps -l qml -r development.1 -s "Platform Services" -i /tmp/apidoc_sources/usr/share/qt5/doc/qtlocation/qtlocation.index
 
 ## QtOrganizer
 ./get_package.py qtpim5-doc-html
-python manage.py import_qdoc -t apps -l qml -r sdk-15.04.1 -s "Platform Services" -i /tmp/apidoc_sources/usr/share/qt5/doc/qtorganizer/qtorganizer.index
-python manage.py import_qdoc -t apps -l qml -r sdk-15.04.1 -s "Platform Services" -i /tmp/apidoc_sources/usr/share/qt5/doc/qtcontacts/qtcontacts.index
+python manage.py import_qdoc -t apps -l qml -r development -s "Platform Services" -i /tmp/apidoc_sources/usr/share/qt5/doc/qtorganizer/qtorganizer.index
+python manage.py import_qdoc -t apps -l qml -r development -s "Platform Services" -i /tmp/apidoc_sources/usr/share/qt5/doc/qtcontacts/qtcontacts.index
 
 ## Ubuntu.Components
 ./get_package.py ubuntu-ui-toolkit-doc
-python manage.py import_qdoc -Pp -t apps -l qml -r sdk-15.04.1 -s "Graphical Interface" -n Ubuntu.Components -i /tmp/apidoc_sources/usr/share/ubuntu-ui-toolkit/doc/html/ubuntuuserinterfacetoolkit.index
+python manage.py import_qdoc -Pp -t apps -l qml -r development -s "Graphical Interface" -n Ubuntu.Components -i /tmp/apidoc_sources/usr/share/ubuntu-ui-toolkit/doc/html/ubuntuuserinterfacetoolkit.index
 
 ## Ubuntu.OnlineAccounts
 ./get_package.py accounts-qml-module-doc
-python manage.py import_qdoc -Pp -t apps -l qml -r sdk-15.04.1 -s "Platform Services" -N Ubuntu.OnlineAccounts -i /tmp/apidoc_sources/usr/share/accounts-qml-module/doc/html/onlineaccounts-qml-api.index
+python manage.py import_qdoc -Pp -t apps -l qml -r development -s "Platform Services" -N Ubuntu.OnlineAccounts -i /tmp/apidoc_sources/usr/share/accounts-qml-module/doc/html/onlineaccounts-qml-api.index
 
 ## Ubuntu.Content
 ./get_package.py libcontent-hub-doc
 gunzip -f /tmp/apidoc_sources/usr/share/doc/content-hub/qml/html/ubuntu-content-qml-api.index.gz
-python manage.py import_qdoc -Pp -t apps -l qml -r sdk-15.04.1 -s "Platform Services" -N Ubuntu.Content -i /tmp/apidoc_sources/usr/share/doc/content-hub/qml/html/ubuntu-content-qml-api.index
+python manage.py import_qdoc -Pp -t apps -l qml -r development -s "Platform Services" -N Ubuntu.Content -i /tmp/apidoc_sources/usr/share/doc/content-hub/qml/html/ubuntu-content-qml-api.index
 
 # U1db
 ./get_package.py libu1db-qt5-doc
-python manage.py import_qdoc -p -t apps -l qml -r sdk-15.04.1 -s "Platform Services" -N U1db -i /tmp/apidoc_sources/usr/share/u1db-qt/doc/html/u1db-qt.index
+python manage.py import_qdoc -p -t apps -l qml -r development -s "Platform Services" -N U1db -i /tmp/apidoc_sources/usr/share/u1db-qt/doc/html/u1db-qt.index
 
 ## Ubuntu.DownloadManager
 ./get_package.py libubuntu-download-manager-client-doc
 gunzip -f /tmp/apidoc_sources/usr/share/doc/ubuntu-download-manager/qml/html/ubuntu-download-manager-qml-api.index.gz
-python manage.py import_qdoc -Pp -t apps -l qml -r sdk-15.04.1 -s "Platform Services" -N Ubuntu.DownloadManager -i /tmp/apidoc_sources/usr/share/doc/ubuntu-download-manager/qml/html/ubuntu-download-manager-qml-api.index
+python manage.py import_qdoc -Pp -t apps -l qml -r development -s "Platform Services" -N Ubuntu.DownloadManager -i /tmp/apidoc_sources/usr/share/doc/ubuntu-download-manager/qml/html/ubuntu-download-manager-qml-api.index
 
 ## Ubuntu.Web
 ./get_package.py qtdeclarative5-ubuntu-web-plugin-doc
 gunzip -f /tmp/apidoc_sources/usr/share/doc/ubuntu-web/html/ubuntuweb.index.gz
-python manage.py import_qdoc -Pp -t apps -l qml -r sdk-15.04.1 -s "Graphical Interface" -N Ubuntu.Web -i /tmp/apidoc_sources/usr/share/doc/ubuntu-web/html/ubuntuweb.index
+python manage.py import_qdoc -Pp -t apps -l qml -r development -s "Graphical Interface" -N Ubuntu.Web -i /tmp/apidoc_sources/usr/share/doc/ubuntu-web/html/ubuntuweb.index
 
 ## Ubuntu.Connectivity
 ./get_package.py connectivity-doc
-python manage.py import_qdoc -Pp -t apps -l qml -r sdk-15.04.1 -s "Platform Services" -N Ubuntu.Connectivity -i /tmp/apidoc_sources/usr/share/doc/connectivity-api/qml/html/connectivity.index
+python manage.py import_qdoc -Pp -t apps -l qml -r development -s "Platform Services" -N Ubuntu.Connectivity -i /tmp/apidoc_sources/usr/share/doc/connectivity-api/qml/html/connectivity.index
 
 #### Aps/HTML5
 ## UbuntuUI
 ./get_package.py ubuntu-html5-ui-toolkit-doc
-python manage.py import_yuidoc -i -t apps -l html5 -r sdk-15.04.1 -s "Graphical Interface" -d /tmp/apidoc_sources/usr/share/doc/ubuntu-html5-ui-toolkit-doc/data.json
+python manage.py import_yuidoc -i -t apps -l html5 -r development -s "Graphical Interface" -d /tmp/apidoc_sources/usr/share/doc/ubuntu-html5-ui-toolkit-doc/data.json
 
 ## Platform Bindings
 ./get_package.py unity-webapps-qml-doc
 ## OnlineAccounts3
-python manage.py import_yuidoc -t apps -l html5 -r sdk-15.04.1 -s "Platform Services" -d /tmp/apidoc_sources/usr/share/unity-webapps-qml/doc/api/online-accounts/data.json
+python manage.py import_yuidoc -t apps -l html5 -r development -s "Platform Services" -d /tmp/apidoc_sources/usr/share/unity-webapps-qml/doc/api/online-accounts/data.json
 ## AlarmAPI
-python manage.py import_yuidoc -t apps -l html5 -r sdk-15.04.1 -s "Platform Services" -d /tmp/apidoc_sources/usr/share/unity-webapps-qml/doc/api/alarm-api/data.json
+python manage.py import_yuidoc -t apps -l html5 -r development -s "Platform Services" -d /tmp/apidoc_sources/usr/share/unity-webapps-qml/doc/api/alarm-api/data.json
 ## ContentHub
-python manage.py import_yuidoc -t apps -l html5 -r sdk-15.04.1 -s "Platform Services" -d /tmp/apidoc_sources/usr/share/unity-webapps-qml/doc/api/content-hub/data.json
+python manage.py import_yuidoc -t apps -l html5 -r development -s "Platform Services" -d /tmp/apidoc_sources/usr/share/unity-webapps-qml/doc/api/content-hub/data.json
 ## RuntimeAPI
-python manage.py import_yuidoc -t apps -l html5 -r sdk-15.04.1 -s "Platform Services" -d /tmp/apidoc_sources/usr/share/unity-webapps-qml/doc/api/runtime-api/data.json
+python manage.py import_yuidoc -t apps -l html5 -r development -s "Platform Services" -d /tmp/apidoc_sources/usr/share/unity-webapps-qml/doc/api/runtime-api/data.json
 
 #### Autopilot/Python
 ## Autopilot
 ./get_package.py python3-autopilot
 find /tmp/apidoc_sources/usr/share/doc/python3-autopilot/json/ -name "*.gz" -print0 |xargs -0 gunzip
-python manage.py import_sphinx -t autopilot -l python -r 1.5.0 -s ./api_docs/importers/autopilot_sections.py -i /tmp/apidoc_sources/usr/share/doc/python3-autopilot/json/objects.inv
+python manage.py import_sphinx -t autopilot -l python -r development -s ./api_docs/importers/autopilot_sections.py -i /tmp/apidoc_sources/usr/share/doc/python3-autopilot/json/objects.inv
 
 ./get_package.py ubuntu-ui-toolkit-autopilot
 find /tmp/apidoc_sources/usr/share/doc/ubuntu-ui-toolkit-autopilot/json/ -name "*.gz" -print0 |xargs -0 gunzip
-python manage.py import_sphinx -t autopilot -l python -r 1.5.0 -s ./api_docs/importers/autopilot_sections.py -i /tmp/apidoc_sources/usr/share/doc/ubuntu-ui-toolkit-autopilot/json/objects.inv
+python manage.py import_sphinx -t autopilot -l python -r development -s ./api_docs/importers/autopilot_sections.py -i /tmp/apidoc_sources/usr/share/doc/ubuntu-ui-toolkit-autopilot/json/objects.inv
 
 ./get_package.py python3-scope-harness
 find /tmp/apidoc_sources/usr/share/doc/python3-scope-harness/json/ -name "*.gz" -print0 |xargs -0 gunzip
-python manage.py import_sphinx -t autopilot -l python -r 1.5.0 -s ./api_docs/importers/autopilot_sections.py -i /tmp/apidoc_sources/usr/share/doc/python3-scope-harness/json/objects.inv
+python manage.py import_sphinx -t autopilot -l python -r development -s ./api_docs/importers/autopilot_sections.py -i /tmp/apidoc_sources/usr/share/doc/python3-scope-harness/json/objects.inv
 
 #### Scopes/C++ 
 ## unity.scopes
 ./get_package.py libunity-scopes-doc
-python manage.py import_doxygen -t scopes -l cpp -r sdk-15.04.1 -s ./api_docs/importers/scope_sections.py -N unity.scopes -d /tmp/apidoc_sources/usr/share/doc/unity-scopes/
+python manage.py import_doxygen -t scopes -l cpp -r development -s ./api_docs/importers/scope_sections.py -N unity.scopes -d /tmp/apidoc_sources/usr/share/doc/unity-scopes/
 
 ## Accounts
 ./get_package.py libaccounts-qt-doc
-python manage.py import_doxygen -t scopes -l cpp -r sdk-15.04.1 -s ./api_docs/importers/accounts_sections.py -n Accounts -d /tmp/apidoc_sources/usr/share/doc/libaccounts-qt/html/
+python manage.py import_doxygen -t scopes -l cpp -r development -s ./api_docs/importers/accounts_sections.py -n Accounts -d /tmp/apidoc_sources/usr/share/doc/libaccounts-qt/html/
 
 ## U1db
 ./get_package.py libu1db-qt5-doc
-python manage.py import_qdoc -Pp -N U1db -t scopes -l cpp -r sdk-15.04.1 -s "Platform Services" -i /tmp/apidoc_sources/usr/share/u1db-qt/doc/html/u1db-qt.index
+python manage.py import_qdoc -Pp -N U1db -t scopes -l cpp -r development -s "Platform Services" -i /tmp/apidoc_sources/usr/share/u1db-qt/doc/html/u1db-qt.index
 
 #### Scopes/Javascript
 SOURCE=http://ppa.launchpad.net/ubuntu-sdk-team/ppa/ubuntu ./get_package.py unity-js-scopes-doc
-python manage.py import_yuidoc -t scopes -l js -r sdk-15.04.1 -s "Platform Services" -d /tmp/apidoc_sources/usr/share/unity-js-scopes/doc/docbuild/data.json
+python manage.py import_yuidoc -t scopes -l js -r development -s "Platform Services" -d /tmp/apidoc_sources/usr/share/unity-js-scopes/doc/docbuild/data.json
 
 rm -r /tmp/apidoc_sources/