Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into feature/exercise-crowdsourcing
Roland Geiderbf4ffee6b35f
diff --cc .github/workflows/ci.ymlindex 47c7062a4,5c79375c4..7c8d39321--- a/.github/workflows/ci.yml+++ b/.github/workflows/ci.yml@@@ -12,23 -12,25 +12,23 @@@ onjobs:ci-job:- runs-on: ubuntu-22.04+ runs-on: ubuntu-lateststrategy:- max-parallel: 3matrix:#TODO: pypy3 has problems compiling lxmlpython-version: [ '3.9', '3.10']name: CI job (python ${{ matrix.python-version }})- services:- postgres:- image: postgres:12-alpine- env:- POSTGRES_USER: wger- POSTGRES_PASSWORD: wger- POSTGRES_DB: wger- ports:- - 5432:5432- # needed because the postgres container does not provide a health check- options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5+ #services:+ # postgres:- # image: postgres:12.0-alpine++ # image: postgres:12-alpine+ # env:+ # POSTGRES_USER: wger+ # POSTGRES_PASSWORD: wger+ # POSTGRES_DB: wger+ # ports:+ # - 5432:5432+ # options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5steps:@@@ -58,10 -60,9 +58,9 @@@pip3 install -e .# Only run the tests with coverage for one version of python- # wger create-settings --database-type postgresql- - name: Test the application with coverage (Postgres)+ - name: Test the application with coveragerun: |- wger create-settings --database-type postgresql+ wger create-settingscoverage run --source='.' ./manage.py testcoverage lcovif: matrix.python-version == 3.10@@@ -72,9 -73,16 +71,11 @@@python manage.py testif: matrix.python-version != 3.10- # - name: Test the application (Sqlite)- # run: |- # wger create-settings- # coverage run --source='.' ./manage.py test- # coverage html --directory coverage-sqlite- # coverage report+- name: Coverallsuses: coverallsapp/github-action@masterwith:github-token: ${{ secrets.GITHUB_TOKEN }}path-to-lcov: coverage.lcovif: matrix.python-version == 3.10++diff --cc requirements.txtindex cd8a203b4,614ce5ddc..67ef2d3c8--- a/requirements.txt+++ b/requirements.txt@@@ -8,20 -8,16 +8,20 @@@ django-bootstrap-breadcrumbs~=0.django-formtools~=2.3django-recaptcha~=3.0.0Django~=3.2+django-activity-stream~=1.4django-crispy-forms~=1.14+django-simple-history~=3.0+django-email-verification~=0.1.0- django_compressor~=4.0- django_extensions~=3.1- django-storages~=1.12+ django_compressor~=4.1+ django_extensions~=3.2+ django-storages~=1.13django-environ==0.9.0- easy-thumbnails==2.8.1+ easy-thumbnails==2.8.3+fontawesomefree~=6.1.1- icalendar==4.0.9+ icalendar==4.1.0invoke==1.7.1- pillow==9.1.1- reportlab==3.6.10+ pillow==9.2.0+ reportlab==3.6.11requests==2.28.1diff --cc requirements_dev.txtindex 8343910ba,587d8dec7..1d554fc56--- a/requirements_dev.txt+++ b/requirements_dev.txt@@@ -9,13 -9,10 +9,13 @@@wheel==0.37.1# for ingredient import script from OFF- pymongo==4.1.1+ pymongo==4.2.0+# for ingredient import script from OFF+pymongo==3.12.1+# Development packages- coverage==6.4.1+ coverage==6.4.2django-debug-toolbar==3.5.0tblib==1.7.0isort==5.10.1diff --cc wger/core/management/commands/extract-i18n.pyindex 63c945dd7,b4f9e4c7c..f52e0e908--- a/wger/core/management/commands/extract-i18n.py+++ b/wger/core/management/commands/extract-i18n.py@@@ -71,10 -70,10 +71,10 @@@ class Command(BaseCommand)out = '''import { useTranslation } from "react-i18next";- export const DummyComponent = () => {- const [t, i18n] = useTranslation();'''+ const DummyComponent = () => {+ const [t] = useTranslation();'''for i in data:- out += f't("exercises.{cleanup_name(i.__str__())}");\n'+ out += f't("server.{cleanup_name(i.__str__())}");\n'out += '''return (<p></p>);