rdmo 2.3.0rc2__tar.gz → 2.3.2__tar.gz

{rdmo-2.3.0rc2 → rdmo-2.3.2}/NOTICE

@@ -79,33 +79,6 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-Django REST Swagger <https://github.com/marcgibbons/django-rest-swagger>
--------------------------------------------------------
-
-Copyright (c) 2013-2016, Marc Gibbons
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 Twitter bootstrap <http://twitter.github.io/bootstrap/>
 -------------------------------------------------------
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rdmo
-Version: 2.3.0rc2
+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
@@ -23,6 +23,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -33,12 +34,11 @@ Requires-Dist: defusedxml<1.0,>=0.7.1
 Requires-Dist: django<5.0,>=4.2
 Requires-Dist: django-cleanup<10.0,>=8.0
 Requires-Dist: django-compressor<5.0,>=4.4
-Requires-Dist: django-extensions<4.0,>=3.2
-Requires-Dist: django-filter<25.0,>=23.2
+Requires-Dist: django-extensions<5.0,>=3.2
+Requires-Dist: django-filter<26.0,>=23.2
 Requires-Dist: django-libsass<1.0,>=0.9
 Requires-Dist: django-mathfilters<2.0,>=1.0
 Requires-Dist: django-mptt<1.0.0,>=0.16.0
-Requires-Dist: django-rest-swagger<3.0,>=2.2
 Requires-Dist: django-settings-export<2.0,>=1.2
 Requires-Dist: django-split-settings<2.0,>=1.2
 Requires-Dist: django-widget-tweaks<2.0,>=1.5
@@ -46,12 +46,12 @@ Requires-Dist: djangorestframework<4.0,>=3.15
 Requires-Dist: drf-extensions<1.0,>=0.7.1
 Requires-Dist: iso8601<3.0,>=2.0
 Requires-Dist: markdown<4.0,>=3.4
-Requires-Dist: packaging<25.0,>=23.2
+Requires-Dist: packaging<26.0,>=23.2
 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.4.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"
@@ -59,11 +59,10 @@ Provides-Extra: dev
 Requires-Dist: build<2.0,>=1.0; extra == "dev"
 Requires-Dist: pipdeptree<3.0,>=2.13; extra == "dev"
 Requires-Dist: pre-commit<5.0,>=3.4; extra == "dev"
-Requires-Dist: setuptools<76,>=73; extra == "dev"
+Requires-Dist: setuptools<81,>=73; extra == "dev"
 Requires-Dist: twine<7.0,>=5.1.1; extra == "dev"
 Requires-Dist: wheel<0.46,>=0.42; extra == "dev"
-Requires-Dist: rdmo[allauth]; extra == "dev"
-Requires-Dist: rdmo[pytest]; extra == "dev"
+Requires-Dist: rdmo[allauth,openapi,pytest]; extra == "dev"
 Provides-Extra: gunicorn
 Requires-Dist: gunicorn<24.0,>=23.0; extra == "gunicorn"
 Provides-Extra: ldap
@@ -80,6 +79,8 @@ Requires-Dist: pytest-mock<4.0,>=3.11; extra == "pytest"
 Requires-Dist: pytest-playwright<0.8.0,>=0.4.3; extra == "pytest"
 Requires-Dist: pytest-randomly<4.0,>=3.15; extra == "pytest"
 Requires-Dist: pytest-xdist<4.0,>=3.3; extra == "pytest"
+Provides-Extra: openapi
+Requires-Dist: drf-spectacular[sidecar]<1.0.0,>=0.28.0; extra == "openapi"
 Dynamic: license-file
 
 RDMO - Research Data Management Organiser
@@ -89,7 +90,6 @@ RDMO - Research Data Management Organiser
 [![Python Versions](https://img.shields.io/pypi/pyversions/rdmo.svg?style=flat)](https://www.python.org/)
 [![Django Versions](https://img.shields.io/pypi/frameworkversions/django/rdmo)](https://pypi.python.org/pypi/rdmo/)
 [![License](https://img.shields.io/github/license/rdmorganiser/rdmo?style=flat)](https://github.com/rdmorganiser/rdmo/blob/main/LICENSE) \
-[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/rdmorganiser/rdmo/main.svg)](https://results.pre-commit.ci/latest/github/rdmorganiser/rdmo/main)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 [![CI Workflow Status](https://github.com/rdmorganiser/rdmo/actions/workflows/ci.yml/badge.svg)](https://github.com/rdmorganiser/rdmo/actions/workflows/ci.yml)

{rdmo-2.3.0rc2 → rdmo-2.3.2}/README.md

@@ -5,7 +5,6 @@ RDMO - Research Data Management Organiser
 [![Python Versions](https://img.shields.io/pypi/pyversions/rdmo.svg?style=flat)](https://www.python.org/)
 [![Django Versions](https://img.shields.io/pypi/frameworkversions/django/rdmo)](https://pypi.python.org/pypi/rdmo/)
 [![License](https://img.shields.io/github/license/rdmorganiser/rdmo?style=flat)](https://github.com/rdmorganiser/rdmo/blob/main/LICENSE) \
-[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/rdmorganiser/rdmo/main.svg)](https://results.pre-commit.ci/latest/github/rdmorganiser/rdmo/main)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 [![CI Workflow Status](https://github.com/rdmorganiser/rdmo/actions/workflows/ci.yml/badge.svg)](https://github.com/rdmorganiser/rdmo/actions/workflows/ci.yml)

{rdmo-2.3.0rc2 → rdmo-2.3.2}/pyproject.toml

@@ -31,6 +31,7 @@ classifiers = [
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
 ]
 dynamic = [
   "version",
@@ -44,12 +45,11 @@ dependencies = [
   "django>=4.2,<5.0",
   "django-cleanup>=8.0,<10.0",
   "django-compressor>=4.4,<5.0",
-  "django-extensions>=3.2,<4.0",
-  "django-filter>=23.2,<25.0",
+  "django-extensions>=3.2,<5.0",
+  "django-filter>=23.2,<26.0",
   "django-libsass>=0.9,<1.0",
   "django-mathfilters>=1.0,<2.0",
   "django-mptt>=0.16.0,<1.0.0",
-  "django-rest-swagger>=2.2,<3.0",
   "django-settings-export>=1.2,<2.0",
   "django-split-settings>=1.2,<2.0",
   "django-widget-tweaks>=1.5,<2.0",
@@ -57,7 +57,7 @@ dependencies = [
   "drf-extensions>=0.7.1,<1.0",
   "iso8601>=2.0,<3.0",
   "markdown>=3.4,<4.0",
-  "packaging>=23.2,<25.0",
+  "packaging>=23.2,<26.0",
   "pypandoc>=1.11,<2.0",
   "requests-toolbelt>=1.0,<2.0",
   "rules>=3.4,<4.0",
@@ -65,7 +65,7 @@ dependencies = [
 
 [project.optional-dependencies]
 allauth = [
-  "django-allauth[socialaccount,openid]>=64.1.0,<65.4.0",
+  "django-allauth[socialaccount,openid]>=64.1.0,<65.10.0",
 ]
 ci = [
   "rdmo[dev]",
@@ -75,11 +75,10 @@ dev = [
   "build>=1.0,<2.0",
   "pipdeptree>=2.13,<3.0",
   "pre-commit>=3.4,<5.0",
-  "setuptools>=73,<76",
+  "setuptools>=73,<81",
   "twine>=5.1.1,<7.0",
   "wheel>=0.42,<0.46",
-  "rdmo[allauth]",
-  "rdmo[pytest]",
+  "rdmo[allauth,openapi,pytest]",
 ]
 gunicorn = [
   "gunicorn>=23.0,<24.0",
@@ -102,6 +101,9 @@ pytest = [
   "pytest-randomly>=3.15,<4.0",
   "pytest-xdist>=3.3,<4.0",
 ]
+openapi = [
+  "drf-spectacular[sidecar]>=0.28.0,<1.0.0"
+]
 
 [project.urls]
 changelog = "https://github.com/rdmorganiser/rdmo/blob/main/CHANGELOG.md"
@@ -207,14 +209,13 @@ filterwarnings = [
   "error::django.utils.deprecation.RemovedInDjango50Warning",
 
   # ignore warnings raised from within coreapi 2.3.3
-  "ignore:'cgi' is deprecated and slated for removal in Python 3.13:DeprecationWarning",
   "ignore:pkg_resources is deprecated as an API:DeprecationWarning",
 
   # ignore warning from rest_framework about coreapi
   "ignore:CoreAPI compatibility is deprecated and will be removed in DRF 3.17:rest_framework.RemovedInDRF317Warning",
 
-  # ignore warning from django_filters
-  "ignore:Built-in schema generation is deprecated. Use drf-spectacular.:django_filters.RemovedInDjangoFilter25Warning",
+  # ignore warnings raised by widget_tweaks.py
+  "ignore:'maxsplit' is passed as positional argument",
 
   # ignore warnings raised from within django itself
   # django/core/files/storage/__init__.py
@@ -228,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.0rc2 → rdmo-2.3.2}/rdmo/accounts/serializers/v1.py

@@ -10,7 +10,7 @@ from rdmo.projects.models import Membership
 from ..models import Role
 
 
-class SiteSerializer(serializers.ModelSerializer):
+class UserSiteSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Site
@@ -21,7 +21,7 @@ class SiteSerializer(serializers.ModelSerializer):
         )
 
 
-class GroupSerializer(serializers.ModelSerializer):
+class UserGroupSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Group
@@ -31,12 +31,12 @@ class GroupSerializer(serializers.ModelSerializer):
         )
 
 
-class RoleSerializer(serializers.ModelSerializer):
+class UserRoleSerializer(serializers.ModelSerializer):
 
-    member = SiteSerializer(many=True)
-    manager = SiteSerializer(many=True)
-    editor = SiteSerializer(many=True)
-    reviewer = SiteSerializer(many=True)
+    member = UserSiteSerializer(many=True)
+    manager = UserSiteSerializer(many=True)
+    editor = UserSiteSerializer(many=True)
+    reviewer = UserSiteSerializer(many=True)
 
     class Meta:
         model = Role
@@ -49,7 +49,7 @@ class RoleSerializer(serializers.ModelSerializer):
         )
 
 
-class MembershipSerializer(serializers.ModelSerializer):
+class UserMembershipSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Membership
@@ -62,9 +62,9 @@ class MembershipSerializer(serializers.ModelSerializer):
 
 class UserSerializer(serializers.ModelSerializer):
 
-    groups = GroupSerializer(many=True)
-    role = RoleSerializer()
-    memberships = MembershipSerializer(many=True)
+    groups = UserGroupSerializer(many=True)
+    role = UserRoleSerializer()
+    memberships = UserMembershipSerializer(many=True)
 
     class Meta:
         model = get_user_model()

{rdmo-2.3.0rc2 → rdmo-2.3.2}/rdmo/accounts/settings.py

@@ -146,5 +146,9 @@ GROUPS = (
       ('projects', 'invite', 'change_invite'),
       ('projects', 'invite', 'delete_invite'),
       ('projects', 'invite', 'view_invite'),
+      ('projects', 'visibility', 'add_visibility'),
+      ('projects', 'visibility', 'change_visibility'),
+      ('projects', 'visibility', 'delete_visibility'),
+      ('projects', 'visibility', 'view_visibility'),
   ))
 )

{rdmo-2.3.0rc2 → 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.0rc2 → 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.0rc2 → 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.0rc2 → rdmo-2.3.2}/rdmo/accounts/utils.py

@@ -12,7 +12,7 @@ from .settings import GROUPS
 log = logging.getLogger(__name__)
 
 
-def get_full_name(user):
+def get_full_name(user) -> str:
     if user.first_name and user.last_name:
         return f'{user.first_name} {user.last_name}'
     else:

rdmo-2.3.2/rdmo/conditions/migrations/0025_alter_condition_uri_path.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.20 on 2025-04-28 12:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('conditions', '0024_uri_path'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='condition',
+            name='uri_path',
+            field=models.CharField(blank=True, default='', help_text='The path for the URI of this condition.', max_length=512, verbose_name='URI Path'),
+        ),
+    ]

{rdmo-2.3.0rc2 → rdmo-2.3.2}/rdmo/conditions/models.py

@@ -40,8 +40,8 @@ class Condition(models.Model):
         verbose_name=_('URI Prefix'),
         help_text=_('The prefix for the URI of this condition.')
     )
-    uri_path = models.SlugField(
-        max_length=512, blank=True,
+    uri_path = models.CharField(
+        max_length=512, blank=True, default="",
         verbose_name=_('URI Path'),
         help_text=_('The path for the URI of this condition.')
     )

{rdmo-2.3.0rc2 → rdmo-2.3.2}/rdmo/conditions/viewsets.py

@@ -42,7 +42,7 @@ class ConditionViewSet(ModelViewSet):
         serializer = ConditionIndexSerializer(queryset, many=True)
         return Response(serializer.data)
 
-    @action(detail=False, url_path='export(/(?P<export_format>[a-z]+))?')
+    @action(detail=False, url_path='export(?:/(?P<export_format>[a-z]+))?')
     def export(self, request, export_format='xml'):
         queryset = self.filter_queryset(self.get_queryset())
         if export_format == 'xml':
@@ -54,7 +54,7 @@ class ConditionViewSet(ModelViewSet):
                 'conditions': queryset
             })
 
-    @action(detail=True, url_path='export(/(?P<export_format>[a-z]+))?')
+    @action(detail=True, url_path='export(?:/(?P<export_format>[a-z]+))?')
     def detail_export(self, request, pk=None, export_format='xml'):
         if export_format == 'xml':
             serializer = ConditionExportSerializer(self.get_object())

rdmo-2.3.2/rdmo/core/apps.py

@@ -0,0 +1,11 @@
+from django.apps import AppConfig, apps
+from django.utils.translation import gettext_lazy as _
+
+
+class CoreConfig(AppConfig):
+    name = 'rdmo.core'
+    verbose_name = _('Core')
+
+    def ready(self):
+        if apps.is_installed('drf_spectacular'):
+            from . import schema  # noqa: F401

{rdmo-2.3.0rc2 → rdmo-2.3.2}/rdmo/core/imports.py

@@ -48,7 +48,7 @@ def handle_fetched_file(filedata):
 
 
 def generate_tempfile_name():
-    t = int(round(time.time() * 1000))
+    t = round(time.time() * 1000)
     r = randint(10000, 99999)
     fn = pj(tempfile.gettempdir(), 'upload_' + str(t) + '_' + str(r) + '.xml')
     return fn

{rdmo-2.3.0rc2 → 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.0rc2 → rdmo-2.3.2}/rdmo/core/pandoc.py

@@ -3,7 +3,7 @@ import logging
 import os
 import re
 from pathlib import Path
-from tempfile import mkstemp
+from tempfile import NamedTemporaryFile
 
 from django.apps import apps
 from django.conf import settings
@@ -19,23 +19,29 @@ def get_pandoc_version():
     return parse_version(pypandoc.get_pandoc_version())
 
 
+def create_tmp_file(suffix):
+    # create a temporary file, return the file path, and close it immediately
+    with NamedTemporaryFile('wb+', suffix=suffix, delete=False) as fp:
+        return Path(fp.name)
+
+
 def get_pandoc_content(html, metadata, export_format, context):
     pandoc_args = get_pandoc_args(export_format, context)
 
     if metadata:
-        # create a temporary file for the metadata
-        (metadata_tmp_fd, metadata_tmp_file_name) = mkstemp(suffix='.json')
+        # create a temporary file for the metadata and close it immediately
+        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
-    (tmp_fd, tmp_file_name) = mkstemp(f'.{export_format}')
+    # create a temporary file and close it immediately
+    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)
@@ -43,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
 
@@ -102,8 +108,10 @@ def get_pandoc_reference_document(export_format, context):
 
     # return the first reference document that actually exists
     for reference_document in reference_documents:
-        if reference_document and reference_document.exists():
-            return Path(reference_document)
+        if reference_document:
+            reference_document = Path(reference_document).resolve()
+            if reference_document.exists():
+                return reference_document
 
 
 def get_pandoc_reference_documents(export_format, context):