rdmo 2.4.2__tar.gz → 2.4.4__tar.gz

{rdmo-2.4.2 → rdmo-2.4.4}/.github/workflows/ci.yml

@@ -42,7 +42,7 @@ jobs:
     # build the webpack bundle
     - uses: actions/setup-node@v6
       with:
-        node-version: 22
+        node-version: 22.22
         cache: npm
     - run: npm ci && npm run build:dist
     - name: Build and inspect package

rdmo-2.4.4/.nvmrc

@@ -0,0 +1 @@
+22.22

{rdmo-2.4.2 → rdmo-2.4.4}/CHANGELOG.md

@@ -1,5 +1,40 @@
 # Changelog 📔
 
+## [RDMO 2.4.4](https://github.com/rdmorganiser/rdmo/releases/tag/2.4.4) (March 26, 2026)
+
+### Bug fixes 🐛
+
+Due to a breaking change in
+[Django Rest Framework 3.17.0](https://github.com/encode/django-rest-framework/releases/tag/3.17.0)
+several bugs needed to be fixed (#1567):
+
+* Refactor `REST_FRAMEWORK` settings
+* Fix page serializers
+* Pin Django Rest Framework minor version
+
+**Milestones**:
+[2.4.4](https://github.com/rdmorganiser/rdmo/milestone/30?closed=1)
+
+**Commit history**: [2.4.3...2.4.4](https://github.com/rdmorganiser/rdmo/compare/2.4.3...2.4.4)
+
+## [RDMO 2.4.3](https://github.com/rdmorganiser/rdmo/releases/tag/2.4.3) (March 16, 2026)
+
+### Important ⚠️
+
+Due to an errors in our release process, RDMO 2.4.1 and RDMO 2.4.2 used an outdated Node.js
+version to build the front-end assets.
+
+### Maintenance and Dependencies 🔧
+
+* Fix `npm` management script and build with correct node version.
+* Upgrade `node` from `22.16` to `22.22`
+* Upgrade copy-webpack-plugin upgrade.
+
+**Milestones**:
+[2.4.3](https://github.com/rdmorganiser/rdmo/milestone/29?closed=1)
+
+**Commit history**: [2.4.2...2.4.3](https://github.com/rdmorganiser/rdmo/compare/2.4.2...2.4.3)
+
 ## [RDMO 2.4.2](https://github.com/rdmorganiser/rdmo/releases/tag/2.4.2) (March 13, 2026)
 
 ### Maintenance and Dependencies 🔧

{rdmo-2.4.2 → rdmo-2.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rdmo
-Version: 2.4.2
+Version: 2.4.4
 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 Community and individual contributors <contact@rdmo.org>
 License-Expression: Apache-2.0
@@ -40,7 +40,7 @@ Requires-Dist: django-mptt<1.0.0,>=0.16.0
 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
-Requires-Dist: djangorestframework<4.0,>=3.15
+Requires-Dist: djangorestframework<3.18,>=3.17
 Requires-Dist: drf-extensions<1.0,>=0.7.1
 Requires-Dist: iso8601<3.0,>=2.0
 Requires-Dist: markdown<4.0,>=3.4

{rdmo-2.4.2 → rdmo-2.4.4}/package-lock.json

@@ -42,7 +42,7 @@
         "@babel/preset-env": "^7.28.0",
         "@babel/preset-react": "^7.28.5",
         "babel-loader": "^10.0.0",
-        "copy-webpack-plugin": "^13.0.0",
+        "copy-webpack-plugin": "^14.0.0",
         "css-loader": "^7.1.1",
         "eslint": "~8.56.0",
         "eslint-plugin-react": "^7.37.2",
@@ -55,7 +55,7 @@
         "webpack-merge": "6.0.1"
       },
       "engines": {
-        "node": "22.16.x",
+        "node": "22.22.x",
         "npm": "10.x"
       }
     },
@@ -3658,20 +3658,20 @@
       }
     },
     "node_modules/copy-webpack-plugin": {
-      "version": "13.0.1",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-13.0.1.tgz",
-      "integrity": "sha512-J+YV3WfhY6W/Xf9h+J1znYuqTye2xkBUIGyTPWuBAT27qajBa5mR4f8WBmfDY3YjRftT2kqZZiLi1qf0H+UOFw==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-14.0.0.tgz",
+      "integrity": "sha512-3JLW90aBGeaTLpM7mYQKpnVdgsUZRExY55giiZgLuX/xTQRUs1dOCwbBnWnvY6Q6rfZoXMNwzOQJCSZPppfqXA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "glob-parent": "^6.0.1",
         "normalize-path": "^3.0.0",
         "schema-utils": "^4.2.0",
-        "serialize-javascript": "^6.0.2",
+        "serialize-javascript": "^7.0.3",
         "tinyglobby": "^0.2.12"
       },
       "engines": {
-        "node": ">= 18.12.0"
+        "node": ">= 20.9.0"
       },
       "funding": {
         "type": "opencollective",
@@ -4864,10 +4864,11 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
-      "dev": true
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.1.tgz",
+      "integrity": "sha512-IxfVbRFVlV8V/yRaGzk0UVIcsKKHMSfYw66T/u4nTwlWteQePsxe//LjudR1AMX4tZW3WFCh3Zqa/sjlqpbURQ==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/font-awesome": {
       "version": "4.7.0",
@@ -6577,16 +6578,6 @@
         }
       ]
     },
-    "node_modules/randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
     "node_modules/react": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
@@ -7351,13 +7342,13 @@
       }
     },
     "node_modules/serialize-javascript": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
-      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-7.0.4.tgz",
+      "integrity": "sha512-DuGdB+Po43Q5Jxwpzt1lhyFSYKryqoNjQSA9M92tyw0lyHIOur+XCalOUe0KTJpyqzT8+fQ5A0Jf7vCx/NKmIg==",
       "dev": true,
       "license": "BSD-3-Clause",
-      "dependencies": {
-        "randombytes": "^2.1.0"
+      "engines": {
+        "node": ">=20.0.0"
       }
     },
     "node_modules/set-function-length": {
@@ -10786,15 +10777,15 @@
       }
     },
     "copy-webpack-plugin": {
-      "version": "13.0.1",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-13.0.1.tgz",
-      "integrity": "sha512-J+YV3WfhY6W/Xf9h+J1znYuqTye2xkBUIGyTPWuBAT27qajBa5mR4f8WBmfDY3YjRftT2kqZZiLi1qf0H+UOFw==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-14.0.0.tgz",
+      "integrity": "sha512-3JLW90aBGeaTLpM7mYQKpnVdgsUZRExY55giiZgLuX/xTQRUs1dOCwbBnWnvY6Q6rfZoXMNwzOQJCSZPppfqXA==",
       "dev": true,
       "requires": {
         "glob-parent": "^6.0.1",
         "normalize-path": "^3.0.0",
         "schema-utils": "^4.2.0",
-        "serialize-javascript": "^6.0.2",
+        "serialize-javascript": "^7.0.3",
         "tinyglobby": "^0.2.12"
       },
       "dependencies": {
@@ -11650,9 +11641,9 @@
       }
     },
     "flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.1.tgz",
+      "integrity": "sha512-IxfVbRFVlV8V/yRaGzk0UVIcsKKHMSfYw66T/u4nTwlWteQePsxe//LjudR1AMX4tZW3WFCh3Zqa/sjlqpbURQ==",
       "dev": true
     },
     "font-awesome": {
@@ -12833,15 +12824,6 @@
       "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
       "dev": true
     },
-    "randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
     "react": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
@@ -13362,13 +13344,10 @@
       "devOptional": true
     },
     "serialize-javascript": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
-      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
-      "dev": true,
-      "requires": {
-        "randombytes": "^2.1.0"
-      }
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-7.0.4.tgz",
+      "integrity": "sha512-DuGdB+Po43Q5Jxwpzt1lhyFSYKryqoNjQSA9M92tyw0lyHIOur+XCalOUe0KTJpyqzT8+fQ5A0Jf7vCx/NKmIg==",
+      "dev": true
     },
     "set-function-length": {
       "version": "1.2.1",

{rdmo-2.4.2 → rdmo-2.4.4}/package.json

@@ -14,7 +14,7 @@
     "url": "https://github.com/rdmorganiser/rdmo"
   },
   "engines": {
-    "node": "22.16.x",
+    "node": "22.22.x",
     "npm": "10.x"
   },
   "dependencies": {
@@ -52,7 +52,7 @@
     "@babel/preset-env": "^7.28.0",
     "@babel/preset-react": "^7.28.5",
     "babel-loader": "^10.0.0",
-    "copy-webpack-plugin": "^13.0.0",
+    "copy-webpack-plugin": "^14.0.0",
     "css-loader": "^7.1.1",
     "eslint": "~8.56.0",
     "eslint-plugin-react": "^7.37.2",

{rdmo-2.4.2 → rdmo-2.4.4}/pyproject.toml

@@ -52,7 +52,7 @@ dependencies = [
   "django-settings-export>=1.2,<2.0",
   "django-split-settings>=1.2,<2.0",
   "django-widget-tweaks>=1.5,<2.0",
-  "djangorestframework>=3.15,<4.0",
+  "djangorestframework>=3.17,<3.18",
   "drf-extensions>=0.7.1,<1.0",
   "iso8601>=2.0,<3.0",
   "markdown>=3.4,<4.0",

{rdmo-2.4.2 → rdmo-2.4.4}/rdmo/core/management/commands/build.py

@@ -11,7 +11,7 @@ from packaging.version import parse
 class Command(BaseCommand):
 
     def add_arguments(self, parser):
-        parser.add_argument('--pretend-version', dest='pretend_version', type=parse)
+        parser.add_argument('version', nargs='?', type=parse)
 
     def handle(self, *args, **options):
         try:
@@ -19,8 +19,8 @@ class Command(BaseCommand):
         except ImportError as e:
             raise CommandError('build is not installed.') from e
 
-        if options['pretend_version'] is not None:
-            os.environ['SETUPTOOLS_SCM_PRETEND_VERSION'] = str(options['pretend_version'])
+        if options['version'] is not None:
+            os.environ['SETUPTOOLS_SCM_PRETEND_VERSION'] = str(options['version'])
 
         # delete dist and rdmo.egg-info
         call_command('clean', 'build')

{rdmo-2.4.2 → rdmo-2.4.4}/rdmo/core/management/commands/npm.py

@@ -19,4 +19,4 @@ class Command(BaseCommand):
             raise CommandError('NVM_DIR does not exist, is nvm.sh installed?')
 
         command = ' '.join(options['command'])
-        subprocess.check_call(['/bin/bash', '-c', f'source {nvm_dir}/nvm.sh; npm {command}'])
+        subprocess.check_call(['/bin/bash', '-c', f'source {nvm_dir}/nvm.sh && nvm use && npm {command}'])

{rdmo-2.4.2 → rdmo-2.4.4}/rdmo/core/settings.py

@@ -178,9 +178,6 @@ CACHES = {
 }
 
 REST_FRAMEWORK = {
-    'DEFAULT_SCHEMA_CLASS': 'rest_framework.schemas.coreapi.AutoSchema',
-    'UNICODE_JSON': False,
-    'DEFAULT_VERSIONING_CLASS': 'rest_framework.versioning.NamespaceVersioning',
     'DEFAULT_AUTHENTICATION_CLASSES': (
         'rest_framework.authentication.BasicAuthentication',
         'rest_framework.authentication.TokenAuthentication',
@@ -188,7 +185,10 @@ REST_FRAMEWORK = {
     ),
     'DEFAULT_RENDERER_CLASSES': (
         'rest_framework.renderers.JSONRenderer',
-    )
+    ),
+    'DEFAULT_VERSIONING_CLASS': 'rest_framework.versioning.URLPathVersioning',
+    'DEFAULT_VERSION': 'v1',
+    'ALLOWED_VERSIONS': ('v1', ),
 }
 
 # Ref: https://drf-spectacular.readthedocs.io/en/latest/settings.html#settings

{rdmo-2.4.2 → rdmo-2.4.4}/rdmo/projects/serializers/v1/page.py

@@ -77,7 +77,7 @@ class QuestionSerializer(ElementModelSerializerMixin, MarkdownSerializerMixin, s
     markdown_fields = ('help', 'text')
 
     model = serializers.SerializerMethodField()
-    conditions = ConditionSerializer(default=None, many=True)
+    conditions = ConditionSerializer(default=list, many=True)
     optionsets = serializers.SerializerMethodField()
 
     verbose_name = serializers.SerializerMethodField()
@@ -125,7 +125,7 @@ class QuestionSetSerializer(ElementModelSerializerMixin, MarkdownSerializerMixin
     markdown_fields = ('title', 'help')
 
     model = serializers.SerializerMethodField()
-    conditions = ConditionSerializer(default=None, many=True)
+    conditions = ConditionSerializer(default=list, many=True)
     elements = serializers.SerializerMethodField()
     verbose_name = serializers.SerializerMethodField()
 
@@ -164,7 +164,7 @@ class PageSerializer(ElementModelSerializerMixin, MarkdownSerializerMixin, seria
     markdown_fields = ('title', 'help')
 
     model = serializers.SerializerMethodField()
-    conditions = ConditionSerializer(default=None, many=True)
+    conditions = ConditionSerializer(default=list, many=True)
     elements = serializers.SerializerMethodField()
     section = serializers.SerializerMethodField()
     prev_page = serializers.SerializerMethodField()

{rdmo-2.4.2 → rdmo-2.4.4}/rdmo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rdmo
-Version: 2.4.2
+Version: 2.4.4
 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 Community and individual contributors <contact@rdmo.org>
 License-Expression: Apache-2.0
@@ -40,7 +40,7 @@ Requires-Dist: django-mptt<1.0.0,>=0.16.0
 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
-Requires-Dist: djangorestframework<4.0,>=3.15
+Requires-Dist: djangorestframework<3.18,>=3.17
 Requires-Dist: drf-extensions<1.0,>=0.7.1
 Requires-Dist: iso8601<3.0,>=2.0
 Requires-Dist: markdown<4.0,>=3.4

{rdmo-2.4.2 → rdmo-2.4.4}/rdmo.egg-info/requires.txt

@@ -11,7 +11,7 @@ django-mptt<1.0.0,>=0.16.0
 django-settings-export<2.0,>=1.2
 django-split-settings<2.0,>=1.2
 django-widget-tweaks<2.0,>=1.5
-djangorestframework<4.0,>=3.15
+djangorestframework<3.18,>=3.17
 drf-extensions<1.0,>=0.7.1
 iso8601<3.0,>=2.0
 markdown<4.0,>=3.4

{rdmo-2.4.2 → rdmo-2.4.4}/testing/config/settings/base.py

@@ -70,12 +70,7 @@ INSTALLED_APPS += [
     'drf_spectacular_sidecar'
 ]
 
-REST_FRAMEWORK.update({
-    'DEFAULT_SCHEMA_CLASS': 'drf_spectacular.openapi.AutoSchema',
-    'DEFAULT_VERSIONING_CLASS': 'rest_framework.versioning.URLPathVersioning',
-    'DEFAULT_VERSION': 'v1',
-    'ALLOWED_VERSIONS': ('v1', ),
-})
+REST_FRAMEWORK['DEFAULT_SCHEMA_CLASS'] = 'drf_spectacular.openapi.AutoSchema'
 
 PROJECT_TABLE_PAGE_SIZE = 5
 

{rdmo-2.4.2 → rdmo-2.4.4}/testing/config/urls.py

@@ -10,7 +10,7 @@ urlpatterns = [
 
     path('', include('rdmo.core.urls')),
     path('api/v1/', include('rdmo.core.urls.v1')),
-    path('api/v1/', include('rdmo.core.urls.v1.openapi', namespace='v1')),
+    path('api/v1/', include('rdmo.core.urls.v1.openapi')),
 
     path('admin/', admin.site.urls),
 ]

{rdmo-2.4.2 → rdmo-2.4.4}/webpack.config.js

@@ -4,6 +4,14 @@ const path = require('path')
 const CopyPlugin = require('copy-webpack-plugin')
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 const TerserPlugin = require('terser-webpack-plugin')
+const semver = require('semver')
+
+// get the engines from package.json and check that we are actually on the correct node version
+const engines = require('./package.json').engines
+if (engines?.node && !semver.satisfies(process.version, engines.node)) {
+  console.error(`Required Node ${engines.node}, but running ${process.version}`)
+  process.exit(1)
+}
 
 // list of separate config objects for each django app and their corresponding java script applications
 const configList = [

rdmo-2.4.2/.nvmrc

@@ -1 +0,0 @@
-22.16