rdmo 2.3.1__tar.gz → 2.3.2__tar.gz

{rdmo-2.3.1/rdmo.egg-info → rdmo-2.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rdmo
-Version: 2.3.1
+Version: 2.3.2
 Summary: RDMO is a tool to support the systematic planning, organisation and implementation of the data management throughout the course of a research project.
 Author-email: RDMO Arbeitsgemeinschaft <rdmo-team@listserv.dfn.de>
 License: Apache-2.0
@@ -51,7 +51,7 @@ Requires-Dist: pypandoc<2.0,>=1.11
 Requires-Dist: requests-toolbelt<2.0,>=1.0
 Requires-Dist: rules<4.0,>=3.4
 Provides-Extra: allauth
-Requires-Dist: django-allauth[openid,socialaccount]<65.8.0,>=64.1.0; extra == "allauth"
+Requires-Dist: django-allauth[openid,socialaccount]<65.10.0,>=64.1.0; extra == "allauth"
 Provides-Extra: ci
 Requires-Dist: rdmo[dev]; extra == "ci"
 Requires-Dist: pytest-github-actions-annotate-failures<0.4.0,>=0.2.0; extra == "ci"

{rdmo-2.3.1 → rdmo-2.3.2}/pyproject.toml

@@ -65,7 +65,7 @@ dependencies = [
 
 [project.optional-dependencies]
 allauth = [
-  "django-allauth[socialaccount,openid]>=64.1.0,<65.8.0",
+  "django-allauth[socialaccount,openid]>=64.1.0,<65.10.0",
 ]
 ci = [
   "rdmo[dev]",
@@ -229,13 +229,11 @@ parallel = true
 
 [tool.coverage.report]
 omit = [
-    "*/management/*",
+    "*/management/commands/*",
     "*/migrations/*",
-    "*/tests/*",
 ]
 exclude_lines = [
-    "raise Exception",
-    "except ImportError:"
+    "raise NotImplementedError"
 ]
 
 [tool.typos] # Ref: https://github.com/crate-ci/typos/blob/master/docs/reference.md

rdmo-2.3.2/rdmo/__init__.py

@@ -0,0 +1 @@
+__version__ = "2.3.2"

{rdmo-2.3.1 → rdmo-2.3.2}/rdmo/accounts/templates/socialaccount/connections.html

@@ -1,5 +1,7 @@
 {% extends 'core/page.html' %}
 {% load i18n %}
+{% load static %}
+{% load accounts_tags %}
 
 {% block page %}
 
@@ -28,8 +30,15 @@
 
             <label for="id_account_{{ base_account.id }}">
                 <input id="id_account_{{ base_account.id }}" type="radio" name="account" value="{{ base_account.id }}"/>
+
+                {% if base_account.provider == 'orcid' %}
+                <a href="https://orcid.org/{{ base_account.uid }}" target="_blank">
+                    <img alt="ORCID logo" src="{% static 'accounts/img/orcid_16x16.png' %}" width="16" height="16" />
+                    https://orcid.org/{{ base_account.uid }}
+                </a>
+                {% else %}
                 <span>{{account.get_brand.name}}</span>
-                <span>({{ account }})</span>
+                {% endif %}
             </label>
 
             {% endwith %}
@@ -55,11 +64,14 @@
 
     {% endif %}
 
+    {% get_inactive_providers as inactive_providers %}
+    {% if inactive_providers %}
     <h2>{% trans 'Add an additional account' %}</h2>
 
     <ul class="socialaccount_providers">
-    {% include "socialaccount/snippets/provider_list.html" with process="connect" %}
+    {% include "socialaccount/snippets/provider_list.html" with process="connect" socialaccount_providers=inactive_providers %}
     </ul>
+    {% endif %}
 
     {% include "socialaccount/snippets/login_extra.html" %}
 

{rdmo-2.3.1 → rdmo-2.3.2}/rdmo/accounts/templates/socialaccount/snippets/provider_list.html

@@ -1,7 +1,9 @@
 {% load socialaccount %}
 {% load static %}
 
+{% if not socialaccount_providers %}
 {% get_providers as socialaccount_providers %}
+{% endif %}
 
 {% for provider in socialaccount_providers %}
 
@@ -18,35 +20,46 @@
 {% endif %}
 
 {% if provider.id == 'orcid' %}
+
 <li class="socialaccount_provider_break">
     <a title="{{provider.name}}" class="socialaccount_provider {{provider.id}}"
         href="{% provider_login_url provider.id process=process scope=scope auth_params=auth_params %}">
         <img src="{% static 'accounts/img/orcid-signin.png' %}" alt="ORCID sign in" />
     </a>
 </li>
+
 {% elif provider.id == 'openid_connect' %}
-    {% if provider.app.provider_id == 'keycloak' %}
-    <li class="socialaccount_provider_break">
-        <a title="{{ provider.name }}" class="socialaccount_provider {{ provider.id }}"
-            href="{% provider_login_url provider process=process scope=scope auth_params=auth_params %}">
-            <img src="{% static 'accounts/img/keycloak_logo_200px.svg' %}" alt="Keycloak sign in" />
-        </a>
-    </li>
-    {% else %}
-    <li>
-        <a title="{{provider.name}}" class="socialaccount_provider {{provider.id}}"
-            href="{% provider_login_url provider process=process scope=scope auth_params=auth_params %}">
-            {{ provider.name }}
-        </a>
-    </li>
+
+{% if provider.app.provider_id == 'keycloak' %}
+<li class="socialaccount_provider_break">
+    <a title="{{ provider.name }}" class="socialaccount_provider {{ provider.app.provider_id }}"
+        href="{% provider_login_url provider process=process scope=scope auth_params=auth_params %}">
+        <img src="{% static 'accounts/img/keycloak_logo_200px.svg' %}" alt="Keycloak sign in" />
+    </a>
+</li>
+{% else %}
+<li>
+    <a title="{{ provider.name }}" class="socialaccount_provider {{ provider.app.provider_id }}"
+        href="{% provider_login_url provider process=process scope=scope auth_params=auth_params %}">
+        {{ provider.name }}
+    </a>
+</li>
 {% endif %}
 
+
 {% else %}
+
 <li>
     <a title="{{provider.name}}" class="socialaccount_provider {{provider.id}}"
         href="{% provider_login_url provider.id process=process scope=scope auth_params=auth_params %}">
+        {% if provider.id == 'dummy' %}
+        <span class="fa fa-meh-o fa-2x"></span>
+        {% else %}
         <span class="fa fa-{{provider.id}} fa-2x"></span>
+        {% endif %}
     </a>
 </li>
+
 {% endif %}
+
 {% endfor %}

{rdmo-2.3.1 → rdmo-2.3.2}/rdmo/accounts/templatetags/accounts_tags.py

@@ -23,3 +23,16 @@ def user_data_as_dl(user):
         html += f'<dt>{additional_value.field.text}</dt><dd>{additional_value.value}</dd>'
     html += '</dl>'
     return mark_safe(html)
+
+
+@register.simple_tag(takes_context=True)
+def get_inactive_providers(context={}):
+    from allauth.socialaccount.templatetags.socialaccount import get_providers
+    if 'form' in context:
+        accounts = context['form'].accounts
+        providers = [account.provider for account in accounts]
+        return [
+            provider
+            for provider in get_providers(context)
+            if provider.id not in providers
+        ]

{rdmo-2.3.1 → rdmo-2.3.2}/rdmo/core/management/commands/find_inactive_users.py

@@ -4,8 +4,7 @@ from datetime import datetime
 
 from django.contrib.auth.models import User
 from django.core.management.base import BaseCommand
-
-import pytz
+from django.utils import timezone
 
 
 class Command(BaseCommand):
@@ -14,7 +13,7 @@ class Command(BaseCommand):
 
     def add_arguments(self, parser):
         parser.add_argument('since',
-                            type=lambda s: pytz.utc.localize(datetime.strptime(s, '%Y-%m-%d')),
+                            type=lambda s: timezone.make_aware(datetime.strptime(s, '%Y-%m-%d')),
                             help='Date since the users have been inactive (format: "2022-12-31").')
         parser.add_argument('-o|--output-file', dest='output_file', default=None,
                             help='Store the output in a csv file.')

{rdmo-2.3.1 → rdmo-2.3.2}/rdmo/core/pandoc.py

@@ -30,18 +30,18 @@ def get_pandoc_content(html, metadata, export_format, context):
 
     if metadata:
         # create a temporary file for the metadata and close it immediately
-        metadata_tmp_file_name = create_tmp_file('.json')
+        metadata_tmp_file_path = create_tmp_file('.json')
 
         # save metadata
-        log.info('Save metadata file %s %s', metadata_tmp_file_name, str(metadata))
-        with open(metadata_tmp_file_name, 'w') as fp:
+        log.info('Save metadata file %s %s', str(metadata_tmp_file_path), str(metadata))
+        with open(metadata_tmp_file_path, 'w') as fp:
             json.dump(metadata, fp)
 
         # add metadata file to pandoc args
-        pandoc_args.append('--metadata-file=' + metadata_tmp_file_name)
+        pandoc_args.append(f'--metadata-file={metadata_tmp_file_path}')
 
     # create a temporary file and close it immediately
-    tmp_file_name = create_tmp_file(f'.{export_format}')
+    tmp_file_path = create_tmp_file(f'.{export_format}')
 
     # convert the file using pandoc
     log.info('Export %s document using args %s.', export_format, pandoc_args)
@@ -49,16 +49,16 @@ def get_pandoc_content(html, metadata, export_format, context):
         r'(<img.+src=["\'])' + settings.STATIC_URL + r'([\w\-\@?^=%&/~\+#]+)', r'\g<1>' +
         str(Path(settings.STATIC_ROOT)) + r'/\g<2>', html
     )
-    pypandoc.convert_text(html, export_format, format='html', outputfile=tmp_file_name, extra_args=pandoc_args)
+    pypandoc.convert_text(html, export_format, format='html', outputfile=tmp_file_path, extra_args=pandoc_args)
 
     # read the created temporary file
-    with open(tmp_file_name, 'rb') as fp:
+    with open(tmp_file_path, 'rb') as fp:
         pandoc_content = fp.read()
 
     # delete temporary files
     if metadata:
-        os.remove(metadata_tmp_file_name)
-    os.remove(tmp_file_name)
+        os.remove(metadata_tmp_file_path)
+    os.remove(tmp_file_path)
 
     return pandoc_content
 

{rdmo-2.3.1 → rdmo-2.3.2}/rdmo/core/utils.py

@@ -209,23 +209,6 @@ def import_class(string):
     return getattr(importlib.import_module(module_name), class_name)
 
 
-def copy_model(instance, **kwargs):
-    # get values from instance which are not id, ForeignKeys or M2M relations
-    data = {}
-    for field in instance._meta.get_fields():
-        if not (field.name == 'id' or field.is_relation):
-            data[field.name] = getattr(instance, field.name)
-
-    # update with the kwargs provided to this function
-    data.update(kwargs)
-
-    # create and save new instance
-    instance_copy = instance._meta.model(**data)
-    instance_copy.save()
-
-    return instance_copy
-
-
 def human2bytes(string):
     if not string or string == '0':
         return 0