Version 2.5

.github/workflows/docker-base.yml

@@ -39,4 +39,4 @@ jobs:
           push: true
           file: extras/docker/base/Dockerfile
           platforms: linux/amd64,linux/arm64,linux/arm/v7
-          tags: ${{ vars.REGISTRY_REPO }}/base:latest,${{ vars.REGISTRY_REPO }}/base:2.4-dev
+          tags: ${{ vars.REGISTRY_REPO }}/base:latest,${{ vars.REGISTRY_REPO }}/base:2.5-dev

AUTHORS.md

@@ -2,16 +2,36 @@
 
 Thank you all for contributing to the project, you are true heroes! 🫶
 
-*Generated on 2026-01-18*
+*Generated on 2026-04-10*
 
 ---
 
 ## Contributors
 
-- Github-actions - [https://github.com/invalid-email-address](https://github.com/invalid-email-address)
 - Roland Geider - [https://github.com/rolandgeider](https://github.com/rolandgeider)
+- Github-actions - [https://github.com/invalid-email-address](https://github.com/invalid-email-address)
+- pankaj-basnet - [https://github.com/pankaj-basnet](https://github.com/pankaj-basnet)
+- Luca van der Wijngaart - [https://github.com/lvdwijngaart](https://github.com/lvdwijngaart)
+- Luca van der Wijngaart - [https://github.com/lvdwijngaart](https://github.com/lvdwijngaart)
+- OTijmen - [https://github.com/OTijmen](https://github.com/OTijmen)
+- betterrrrr - [https://github.com/betterrrrr](https://github.com/betterrrrr)
+- Imad Rahhali - [https://github.com/ImadRahhali](https://github.com/ImadRahhali)
+- MadoctheHadoc - [https://github.com/MadoctheHadoc](https://github.com/MadoctheHadoc)
+- Ilya - [https://github.com/Really-Fun](https://github.com/Really-Fun)
+- shihab - [https://github.com/shihabhasan0161](https://github.com/shihabhasan0161)
+- infektyd - [https://github.com/infektyd](https://github.com/infektyd)
+- Sam Tucker-Davis - [https://github.com/stuckvgn](https://github.com/stuckvgn)
+- Stavros Kois - [https://github.com/stavros-k](https://github.com/stavros-k)
+- AlexisBirling3
+- Sam - [https://github.com/stuckvgn](https://github.com/stuckvgn)
+- stuckvgn - [https://github.com/stuckvgn](https://github.com/stuckvgn)
+- Francisco - [https://github.com/franchsli](https://github.com/franchsli)
+- cryptbrn - [https://github.com/cryptbrn](https://github.com/cryptbrn)
+- ndimoro - [https://github.com/ndimoro](https://github.com/ndimoro)
+- yontank - [https://github.com/yontank](https://github.com/yontank)
 - Justin - [https://github.com/justin-pinheiro](https://github.com/justin-pinheiro)
 - Justin Pinheiro - [https://github.com/justin-pinheiro](https://github.com/justin-pinheiro)
+- tbouri - [https://github.com/tbouri](https://github.com/tbouri)
 - HairyCrabW - [https://github.com/HairyCrabW](https://github.com/HairyCrabW)
 - Jeremy - [https://github.com/zru-1](https://github.com/zru-1)
 - Yousef - [https://github.com/yza-cmu](https://github.com/yza-cmu)
@@ -179,6 +199,7 @@ Thank you all for contributing to the project, you are true heroes! 🫶
 
 ### Chinese (Simplified Han script)
 
+- youkarin - [https://github.com/yukarin4869](https://github.com/yukarin4869)
 - KW Lam - [https://github.com/loksonlkw](https://github.com/loksonlkw)
 - Herb Huang
 
@@ -212,6 +233,7 @@ Thank you all for contributing to the project, you are true heroes! 🫶
 
 ### Danish
 
+- Thomas Hansen - [https://github.com/BitKid-exe](https://github.com/BitKid-exe)
 - Fedder Skovgaard - [https://github.com/fedders](https://github.com/fedders)
 - Tomasz Cielecki - [https://github.com/Cheesebaron](https://github.com/Cheesebaron)
 - Roland Geider - [https://github.com/rolandgeider](https://github.com/rolandgeider)
@@ -241,6 +263,7 @@ Thank you all for contributing to the project, you are true heroes! 🫶
 
 ### French
 
+- Thomas Peyrot - [https://github.com/Thomas-PEYROT](https://github.com/Thomas-PEYROT)
 - Justin Pinheiro - [https://github.com/justin-pinheiro](https://github.com/justin-pinheiro)
 - Paul Bonneau - [https://github.com/paulbonneau](https://github.com/paulbonneau)
 - Kilian
@@ -317,12 +340,14 @@ Thank you all for contributing to the project, you are true heroes! 🫶
 
 ### Japanese
 
+- heppocogne - [https://github.com/heppocogne](https://github.com/heppocogne)
 - Ryohei Morimoto - [https://github.com/Ryohei-Caulked](https://github.com/Ryohei-Caulked)
 - sasukeiscool - [https://github.com/sasukeiscool](https://github.com/sasukeiscool)
 - yuki chi - [https://github.com/kumo2kumo](https://github.com/kumo2kumo)
 
 ### Korean
 
+- Hosted Weblate user 141821
 - kobo
 - 고수처럼 - [https://github.com/rrrmaster](https://github.com/rrrmaster)
 - Gyu-sun Youm - [https://github.com/Perlmint](https://github.com/Perlmint)
@@ -358,6 +383,7 @@ Thank you all for contributing to the project, you are true heroes! 🫶
 
 ### Portuguese
 
+- Edson Wolf - [https://github.com/edsonblwolf](https://github.com/edsonblwolf)
 - Ninguém Mesmo
 - Luiz Felipe Guidorizzi de Oliveira - [https://github.com/EvilMonark](https://github.com/EvilMonark)
 - Wilton Rodrigues
@@ -376,6 +402,7 @@ Thank you all for contributing to the project, you are true heroes! 🫶
 
 ### Romanian
 
+- Teodor Olteanu - [https://github.com/StickSy](https://github.com/StickSy)
 - Vlad Bejenaru - [https://github.com/vladbejenaru](https://github.com/vladbejenaru)
 - B Sebastian
 - Daniel Vigaru - [https://github.com/danielvigaru](https://github.com/danielvigaru)
@@ -400,6 +427,7 @@ Thank you all for contributing to the project, you are true heroes! 🫶
 
 ### Spanish
 
+- David Peñas - [https://github.com/davidpgomez](https://github.com/davidpgomez)
 - v7mbz
 - Jose David Villegas (JoseDv1) - [https://github.com/JoseDv1](https://github.com/JoseDv1)
 - Oscar González - [https://github.com/ogrydc](https://github.com/ogrydc)
@@ -426,6 +454,10 @@ Thank you all for contributing to the project, you are true heroes! 🫶
 - stefan - [https://github.com/clint1337](https://github.com/clint1337)
 - Allan Nordhøy - [https://github.com/comradekingu](https://github.com/comradekingu)
 
+### Tamil
+
+- saraswathi - [https://github.com/saraswathirajkumar18](https://github.com/saraswathirajkumar18)
+
 ### Turkish
 
 - Oğuz Ersen - [https://github.com/oersen](https://github.com/oersen)
@@ -435,7 +467,7 @@ Thank you all for contributing to the project, you are true heroes! 🫶
 
 ### Ukrainian
 
-- Максим Горпиніч - [https://github.com/maksim2005UKR](https://github.com/maksim2005UKR)
+- Максим Горпиніч
 - Максим Горпиніч - [https://github.com/Maksim2005UA](https://github.com/Maksim2005UA)
 - Максим Горпиніч
 - Максим Горпиніч

CHANGELOG.md

@@ -24,3 +24,16 @@ timer or similar. The `setting-repetitionunit` endpoint now exposes the new fiel
 
 <https://github.com/wger-project/wger/issues/2124>
 Automatically read the date from uploaded image to the gallery.
+
+<https://github.com/wger-project/wger/pull/2292> Move the variation ID from an
+(empty) table to a field in the exercise model. This  simplifies a lot of code
+and allows us to properly sync them to local instances  as well.
+The API endpoint `/api/v2/variations/` API endpoint has been removed.
+
+Improve serving size support for ingredients. Users can now log food in
+everyday units like "1 Serving (2 biscuits)" or "1 Cup" instead of only grams,
+with serving sizes automatically imported from Open Food Facts.
+The `/api/v2/weightunit/` endpoint has been removed.
+
+The deprecated API endpoint `/api/v2/exercise/search/` has been removed. Use the
+regular `/api/v2/exerciseinfo/` endpoint with appropriate query parameters instead.

extras/scripts/filter-fixtures.py

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 
 # This file is part of wger Workout Manager.
 #
@@ -19,93 +19,100 @@
 manageable chunks.
 
 After dumping the database (or parts of it), just copy the file and filter it:
-    python ./manage.py dumpdata --indent 4 --natural-foreign > extras/scripts/data.json
+    python ./manage.py dumpdata --indent 4 --natural-foreign exercises > extras/scripts/data.json
     cd extras/scripts
     python3 filter-fixtures.py
-    mv exercises.json ../../wger/exercises/fixtures/
+    mv categories.json muscles.json equipment.json translations.json exercise-base-data.json ../../wger/exercises/fixtures
     ...
     rm *.json
 """
 
 import json
+import sys
 
-# This is a full dump of the DB
-fixture = open('data.json')
-data = json.load(fixture)
-fixture.close()
-
-
-def filter_dump(model_list, filename):
+def filter_dump(data, model_list, filename):
     """
     Helper function
     """
-    filter_data = [i for i in data if i['model'] in model_list]
-    if filter_data:
-        with open(filename, 'w') as outfile:
-            # Filter out submission models that are not accepted, if an entry
-            # has no 'status' field, add them all
-            out_data = [entry for entry in filter_data if entry['fields'].get('status', '2') == '2']
-            json.dump(out_data, outfile, indent=4)
+    model_set = set(model_list)
+    filter_data = [i for i in data if i['model'] in model_set]
+    if not filter_data:
+        # print(f'Warning: no data found for {model_list}')
+        return
 
+    with open(filename, 'w') as outfile:
+        json.dump(filter_data, outfile, indent=4)
 
-#
-# Ingredients
-#
-filter_dump(('nutrition.ingredient',), 'ingredients.json')
-filter_dump(('nutrition.weightunit',), 'weight_units.json')
-filter_dump(('nutrition.ingredientweightunit',), 'ingredient_units.json')
-filter_dump(('nutrition.logitem',), 'nutrition_diary.json')
 
-#
-# Exercises
-#
-filter_dump(('exercises.muscle',), 'muscles.json')
-filter_dump(('exercises.exercisecategory',), 'categories.json')
-filter_dump(('exercises.exerciseimage',), 'exercise-images.json')
-filter_dump(
-    (
-        'exercises.exercise',
-        'exercises.variation',
-    ),
-    'exercise-base-data.json',
-)
-filter_dump(
-    ('exercises.translation', 'exercises.exercisecomment', 'exercises.alias'), 'translations.json'
-)
-filter_dump(
-    (
-        'exercises.equipment',
-        'exercises.equipment',
-    ),
-    'equipment.json',
-)
+def main():
+    # This is a full dump of the DB
+    try:
+        with open('data.json') as fixture:
+            data = json.load(fixture)
+    except FileNotFoundError:
+        sys.exit('Error: data.json not found. Please run dumpdata first (see docstring for usage).')
+    except json.JSONDecodeError as e:
+        sys.exit(f'Error: data.json contains invalid JSON: {e}')
 
-#
-# Gym
-#
-filter_dump(('gym.gym',), 'gyms.json')
-filter_dump(('gym.gymconfig',), 'gym_config.json')
-filter_dump(('gym.gymadminconfig',), 'gym_adminconfig.json')
-filter_dump(('gym.gymuserconfig',), 'gym_userconfig.json')
-filter_dump(('gym.adminusernote',), 'gym_admin_user_notes.json')
-filter_dump(('gym.userdocument',), 'gym_user_documents.json')
-filter_dump(('gym.contract',), 'gym_contracts.json')
+    #
+    # Ingredients
+    #
+    filter_dump(data, ('nutrition.ingredient',), 'ingredients.json')
+    filter_dump(data, ('nutrition.weightunit',), 'weight_units.json')
+    filter_dump(data, ('nutrition.ingredientweightunit',), 'ingredient_units.json')
+    filter_dump(data, ('nutrition.logitem',), 'nutrition_diary.json')
 
-#
-# Core
-#
-filter_dump(('core.gym',), 'gyms.json')
-filter_dump(('core.language',), 'languages.json')
-filter_dump(('core.license',), 'licenses.json')
-filter_dump(('core.repetitionunit',), 'repetition_units.json')
+    #
+    # Exercises
+    #
+    filter_dump(data, ('exercises.muscle',), 'muscles.json')
+    filter_dump(data, ('exercises.exercisecategory',), 'categories.json')
+    filter_dump(data, ('exercises.exerciseimage',), 'exercise-images.json')
+    filter_dump(
+        data,
+        (
+            'exercises.exercise',
+            'exercises.variation',
+        ),
+        'exercise-base-data.json',
+    )
+    filter_dump(
+        data,
+        ('exercises.translation', 'exercises.exercisecomment', 'exercises.alias'),
+        'translations.json',
+    )
+    filter_dump(data, ('exercises.equipment',), 'equipment.json')
 
-#
-# Configurations
-#
-filter_dump(('config.gymconfig',), 'gym_config.json')
+    #
+    # Gym
+    #
+    filter_dump(data, ('gym.gym',), 'gyms.json')
+    filter_dump(data, ('gym.gymconfig',), 'gym_config.json')
+    filter_dump(data, ('gym.gymadminconfig',), 'gym_adminconfig.json')
+    filter_dump(data, ('gym.gymuserconfig',), 'gym_userconfig.json')
+    filter_dump(data, ('gym.adminusernote',), 'gym_admin_user_notes.json')
+    filter_dump(data, ('gym.userdocument',), 'gym_user_documents.json')
+    filter_dump(data, ('gym.contract',), 'gym_contracts.json')
 
-#
-# Other
-#
-filter_dump(('auth.group',), 'groups.json')
-filter_dump(('auth.user',), 'users.json')
+    #
+    # Core
+    #
+    filter_dump(data, ('core.gym',), 'gyms.json')
+    filter_dump(data, ('core.language',), 'languages.json')
+    filter_dump(data, ('core.license',), 'licenses.json')
+    filter_dump(data, ('core.repetitionunit',), 'repetition_units.json')
+
+    #
+    # Configurations
+    #
+    filter_dump(data, ('config.gymconfig',), 'gym_config.json')
+
+    #
+    # Other
+    #
+    filter_dump(data, ('auth.group',), 'groups.json')
+    filter_dump(data, ('auth.user',), 'users.json')
+
+
+if __name__ == '__main__':
+    main()