Merge branch 'hotfix/24.05.2'

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12-alpine3.17 as base
+FROM python:3.12-alpine3.17 AS base
 
 # Creation of www-data group was removed as it is created by default in alpine 3.14 and higher
 # Alpine does not create a www-data user, so we still need to create that. 82 is the standard
@@ -30,7 +30,7 @@ ENV POETRY_NO_INTERACTION=1 \
     POETRY_VIRTUALENVS_OPTIONS_ALWAYS_COPY=1 \
     POETRY_VIRTUALENVS_CREATE=0
 
-FROM base as build
+FROM base AS build
 
 ENV POETRY_VIRTUALENVS_IN_PROJECT=1 \
     YARN_CACHE_FOLDER=/tmp/yarn-cache \
@@ -128,7 +128,7 @@ RUN \
 COPY ./ ./
 
 ARG GIT_COMMIT=
-ENV GIT_COMMIT ${GIT_COMMIT}
+ENV GIT_COMMIT=${GIT_COMMIT}
 
 # TODO: Admin/API should fully specify their bower static deps, and not
 #       include ./website/static in their defaults.py.
@@ -149,7 +149,7 @@ RUN for module in \
    ; done \
    && rm ./website/settings/local.py ./api/base/settings/local.py
 
-FROM base as runtime
+FROM base AS runtime
 
 WORKDIR /code
 COPY --from=build /usr/local/lib/python3.12 /usr/local/lib/python3.12

addons/dataverse/requirements.txt

@@ -1,3 +1,3 @@
 # Allow for optional timeout parameter.
 # https://github.com/IQSS/dataverse-client-python/pull/27
-git+https://github.com/CenterForOpenScience/dataverse-client-python.git@feature/dv-client-updates
+git+https://github.com/CenterForOpenScience/dataverse-client-python.git@2b3827578048e6df3818f82381c7ea9a2395e526 # branch is feature/dv-client-updates

addons/mendeley/requirements.txt

@@ -1,2 +1,2 @@
 # up-to-date with mendeley's master + add folder support and future dep updates
-git+https://github.com/CenterForOpenScience/mendeley-python-sdk.git@feature/osf-dep-updates
+git+https://github.com/CenterForOpenScience/mendeley-python-sdk.git@be8a811fa6c3b105d9f5c656cabb6b1ba855ed5b # branch is feature/osf-dep-updates

api/ia/views.py

@@ -30,7 +30,7 @@ def get_target(self, target_id):
 
     def post(self, request, *args, **kwargs):
         registration = self.get_object()
-        ia_url = json.loads(request._request._body.decode())['ia_url']
+        ia_url = json.loads(request.body)['ia_url']
         registration.ia_url = ia_url
         registration.save()
         return JsonResponse({'status': 'complete'})

docker-compose-dist-arm64.override.yml

@@ -1,7 +1,5 @@
 ## Reference README-docker-compose.md for instructions.
 
-version: '3.4'
-
 services:
 
   #######

docker-compose-dist.override.yml

@@ -1,5 +1,3 @@
-version: "3.4"
-
 # Additional configuration for development on services linked with osf.io
 # services:
 

docker-compose.yml

@@ -1,7 +1,5 @@
 # Reference README-docker-compose.md for instructions.
 
-version: '3.5'
-
 volumes:
   redis_data_vol:
     external: false

osf/metrics/reports.py

@@ -1,7 +1,7 @@
 import datetime
 
 from django.dispatch import receiver
-from elasticsearch_dsl import InnerDoc
+from elasticsearch6_dsl import InnerDoc
 from elasticsearch_metrics import metrics
 from elasticsearch_metrics.signals import pre_save as metrics_pre_save
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "osf-io"
-version = "24.05.0"
+version = "24.05.2"
 description = "The code for [https://osf.io](https://osf.io)."
 authors = ["Your Name <[email protected]>"]
 license = "Apache License 2.0"
@@ -73,7 +73,7 @@ cryptography = "42.0.5"
 jsonschema = "4.21.1"
 django-guardian = "2.4.0"
 # Admin requirements
-django-webpack-loader = {git = "https://github.com/felliott/django-webpack-loader.git", rev = "af8438c2da909ec9f2188a6c07c9d2caad0f7e93"}
+django-webpack-loader = {git = "https://github.com/CenterForOpenScience/django-webpack-loader.git", rev = "af8438c2da909ec9f2188a6c07c9d2caad0f7e93"} # branch is feature/v1-webpack-stats
 django-sendgrid-v5 = "1.2.3" # metadata says python 3.10 not supported, but tests pass
 
 # Analytics requirements
@@ -94,7 +94,7 @@ datacite = "1.1.3"
 rdflib = "7.0.0"
 colorlog = "6.8.2"
 # Metrics
-django-elasticsearch-metrics = {git ="https://github.com/CenterForOpenScience/django-elasticsearch-metrics", branch = "feature/pin-esdsl"}
+django-elasticsearch-metrics = {git ="https://github.com/CenterForOpenScience/django-elasticsearch-metrics.git", rev = "f5b9312914154e213aa01731e934c593e3434269"} # branch is feature/pin-esdsl
 # Impact Metrics CSV Export
 djangorestframework-csv = "3.0.2"
 gevent = "24.2.1"
@@ -144,15 +144,15 @@ asgiref = "3.7.2"
 boxsdk = "3.9.2"
 # Allow for optional timeout parameter.
 # https://github.com/IQSS/dataverse-client-python/pull/27
-dataverse = {git = "https://github.com/CenterForOpenScience/dataverse-client-python.git", rev="2b3827578048e6df3818f82381c7ea9a2395e526"}
+dataverse = {git = "https://github.com/CenterForOpenScience/dataverse-client-python.git", rev="2b3827578048e6df3818f82381c7ea9a2395e526"} # branch is feature/dv-client-updates
 dropbox = "11.36.2"
 
 cachecontrol = "0.14.0"
 "github3.py" = "4.0.1"
 uritemplate = "4.1.1"
 python-gitlab = "4.4.0"
 # up-to-date with mendeley's master + add folder support and future dep updates
-mendeley = {git = "https://github.com/CenterForOpenScience/mendeley-python-sdk.git", rev="feature/osf-dep-updates"}
+mendeley = {git = "https://github.com/CenterForOpenScience/mendeley-python-sdk.git", rev="be8a811fa6c3b105d9f5c656cabb6b1ba855ed5b"} # branch is feature/osf-dep-updates
 # Requirements for the owncloud add-on
 pyocclient = "0.6.0"
 boto3 = "1.34.60"

requirements.txt

@@ -73,7 +73,7 @@ django-guardian==2.4.0
 
 # Admin requirements
 # django-webpack-loader==3.1.0
-git+https://github.com/felliott/django-webpack-loader@feature/old-style-peanut-butter
+git+https://github.com/CenterForOpenScience/django-webpack-loader.git@af8438c2da909ec9f2188a6c07c9d2caad0f7e93 # branch is feature/v1-webpack-stats
 django-sendgrid-v5==1.2.3 # metadata says python 3.10 not supported, but tests pass
 
 # Analytics requirements
@@ -100,7 +100,7 @@ packaging==24.0
 
 colorlog==6.8.2
 # Metrics
-git+https://github.com/CenterForOpenScience/django-elasticsearch-metrics@feature/pin-esdsl
+git+https://github.com/CenterForOpenScience/django-elasticsearch-metrics.git@f5b9312914154e213aa01731e934c593e3434269 # branch is feature/pin-esdsl
 
 # Impact Metrics CSV Export
 djangorestframework-csv==3.0.2