Merge branch 'release/2.4.0'

Author: chrisseto

Dockerfile

@@ -52,7 +52,9 @@ COPY ./ /code/
 
 RUN python manage.py collectstatic --noinput
 
+ARG GIT_TAG=
 ARG GIT_COMMIT=
+ENV VERSION ${GIT_TAG}
 ENV GIT_COMMIT ${GIT_COMMIT}
 
 CMD ["python", "manage.py", "--help"]

api/serializers.py

@@ -125,11 +125,14 @@ def get_token(self, obj):
     def is_superuser(self, obj):
         return obj.is_superuser
 
+    def get_favicon(self, obj):
+        return obj.favicon.url if obj.favicon else None
+
     class Meta:
         model = models.ShareUser
         fields = (
             'username', 'first_name', 'last_name', 'email', 'date_joined', 'last_login',
-            'is_active', 'gravatar', 'locale', 'time_zone'
+            'is_active', 'gravatar', 'locale', 'time_zone', 'favicon'
         )
 
 
@@ -146,7 +149,7 @@ def provider_name(self, obj):
 
     class Meta:
         model = models.ShareUser
-        fields = ('home_page', 'long_title', 'date_joined', 'gravatar')
+        fields = ('home_page', 'long_title', 'date_joined', 'gravatar', 'favicon')
 
 
 class SiteBannerSerializer(ShareModelSerializer):

api/urls.py

@@ -93,6 +93,7 @@ def register_url(self, subclass, viewset):
 ]
 
 urlpatterns = [
+    url(r'status/?', views.ServerStatusView.as_view(), name='status'),
     url(r'rss/?', views.CreativeWorksRSS(), name='rss'),
     url(r'atom/?', views.CreativeWorksAtom(), name='atom'),
     url(r'graph/?', GraphQLView.as_view(graphiql=True)),

api/views/share.py

@@ -5,13 +5,16 @@
 from rest_framework_json_api import serializers
 
 from django import http
+from django.conf import settings
+from django.views.decorators.http import require_GET
 from django.views.generic.base import RedirectView
 from django.shortcuts import get_object_or_404
 
 from api.filters import ShareObjectFilterSet
 from api import serializers as api_serializers
 
 from share.util import IDObfuscator, InvalidID
+from share.models import ShareUser
 
 
 class VersionsViewSet(viewsets.ReadOnlyModelViewSet):
@@ -107,6 +110,16 @@ def get(self, request, *args, **kwargs):
         return Response(ser.data)
 
 
+@require_GET
+def user_favicon_view(request, username):
+    user = get_object_or_404(ShareUser, username=username)
+    if not user.favicon:
+        raise http.Http404('Favicon for user {} does not exist'.format(user.username))
+    response = http.FileResponse(user.favicon)
+    response['Content-Type'] = 'image/x-icon'
+    return response
+
+
 class HttpSmartResponseRedirect(http.HttpResponseRedirect):
     status_code = 307
 
@@ -127,3 +140,15 @@ def get(self, request, *args, **kwargs):
                 return HttpSmartResponsePermanentRedirect(url)
             return HttpSmartResponseRedirect(url)
         return http.HttpResponseGone()
+
+
+class ServerStatusView(views.APIView):
+    def get(self, request):
+        return Response({
+            'id': '1',
+            'type': 'Status',
+            'attributes': {
+                'status': 'up',
+                'version': settings.VERSION,
+            }
+        })

docs/harvesters_and_normalizers.rst

@@ -149,12 +149,12 @@ Adding a new provider
     - See :ref:`Best practices for writing a non-OAI Harvester <writing-harvesters>`
 - Writing the normalizer
     - See :ref:`Best practices for writing a non-OAI Normalizer <writing-normalizers>`
-- Adding the migration
-    - Finally, run ``./manage.py makeprovidermigrations`` in the terminal
-    - Include only the relevant migration in the PR
 - Adding a provider's favicon
     - visit ``www.domain.com/favicon.ico`` and download the ``favicon.ico`` file
-    - place ``favicon.ico`` in ``providers/domain/provider_name/static/domain.provider_name/img/``
+    - place ``favicon.ico`` in the ``providers/`` specific folder
+- Adding the migration
+    - Finally, run ``./manage.py makeprovidermigrations`` in the terminal
+    - Include only the relevant migrations in the PR
 
 .. _OAI-PMH: http://www.openarchives.org/OAI/openarchivesprotocol.html
 

project/settings.py

@@ -11,6 +11,7 @@
 """
 
 import os
+import subprocess
 
 from django.utils.log import DEFAULT_LOGGING
 
@@ -35,6 +36,14 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = bool(os.environ.get('DEBUG', True))
 
+if 'VERSION' not in os.environ and DEBUG:
+    try:
+        VERSION = subprocess.check_output(['git', 'describe']).decode().strip()
+    except subprocess.CalledProcessError:
+        VERSION = 'UNKNOWN'
+else:
+    VERSION = os.environ.get('VERSION') or 'UNKNOWN'
+
 ALLOWED_HOSTS = os.environ.get('ALLOWED_HOSTS', '').split(' ')
 
 AUTH_USER_MODEL = 'share.ShareUser'
@@ -95,6 +104,7 @@
     'providers.com.peerj',
     'providers.com.peerj.preprints',
     'providers.com.peerj.xml',
+    'providers.com.researchregistry',
     'providers.com.springer',
     'providers.edu.ageconsearch',
     'providers.edu.asu',
@@ -190,6 +200,7 @@
     'providers.gov.scitech',
     'providers.gov.usgs',
     'providers.info.spdataverse',
+    'providers.info.ssoar',
     'providers.io.osf',
     'providers.io.osf.preprints',
     'providers.io.osf.registrations',
@@ -605,6 +616,8 @@
 DATAVERSE_API_KEY = os.environ.get('DATAVERSE_API_KEY')
 PLOS_API_KEY = os.environ.get('PLOS_API_KEY')
 SPRINGER_API_KEY = os.environ.get('SPRINGER_API_KEY')
+RESEARCHREGISTRY_APPLICATION_ID = os.environ.get('RESEARCHREGISTRY_APPLICATION_ID', '54a1ac1032e4beb07e04ac2c')
+RESEARCHREGISTRY_API_KEY = os.environ.get('RESEARCHREGISTRY_API_KEY', 'renderer')
 
 import djcelery  # noqa
 djcelery.setup_loader()

project/urls.py

@@ -22,7 +22,7 @@
 
 from osf_oauth2_adapter import views as osf_oauth2_adapter_views
 
-from api.views import APIVersionRedirectView
+from api.views import APIVersionRedirectView, user_favicon_view
 
 urlpatterns = [
     url(r'^admin/', admin.site.urls),
@@ -38,7 +38,8 @@
     url(r'^favicon.ico$', RedirectView.as_view(
         url=staticfiles_storage.url('favicon.ico'),
         permanent=False
-    ), name="favicon"),
+    ), name='favicon'),
+    url(r'^favicons/(?P<username>[^/]+).ico$', user_favicon_view, name='user_favicon'),
 ]
 
 if settings.DEBUG:

…ers/au/uow/static/au.uow/img/favicon.ico providers/au/uow/favicon.icoproviders/au/uow/static/au.uow/img/favicon.ico renamed to providers/au/uow/favicon.ico providers/au/uow/static/au.uow/img/favicon.ico renamed to providers/au/uow/favicon.ico

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2017-02-01 21:23
+from __future__ import unicode_literals
+
+from django.db import migrations
+import share.robot
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('au.uow', '0001_initial'),
+        ('share', '0018_store_favicons'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            code=share.robot.RobotFaviconMigration('au.uow'),
+        ),
+    ]