Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Merge branch 'master' into feature/exercise-crowdsourcing

Roland Geidered2d7be5d7a4
diff --cc .github/workflows/ci.yml
index 74334fdcf,6bf0b205a..c16e843c0
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@@ -8,7 -16,7 +16,7 @@@ jobs
strategy:
max-parallel: 3
matrix:
- python-version: [ 3.8, 3.9, pypy3 ]
- python-version: [ '3.7', '3.8', '3.9', '3.10', pypy3 ]
++ python-version: [ '3.8', '3.9', '3.10', pypy3 ]
name: CI job (python ${{ matrix.python-version }})
services:
diff --cc requirements.txt
index 891adeeff,e549724d9..abca9fb68
--- a/requirements.txt
+++ b/requirements.txt
@@@ -8,20 -8,18 +8,20 @@@ django-bootstrap-breadcrumbs~=0.
django-formtools~=2.3
django-recaptcha~=2.0.6
Django~=3.2
-django-crispy-forms~=1.13
+django-crispy-forms~=1.12
+django-simple-history~=3.0
+django-email-verification~=0.1.0
django_compressor~=2.4
django_extensions~=3.1
- django-storages~=1.11
- easy-thumbnails~=2.7
- icalendar==4.0.7
+ django-storages~=1.12
+ easy-thumbnails~=2.8
+ icalendar==4.0.9
invoke~=1.6
- pillow~=8.3
- reportlab==3.6.1
- requests
+ pillow~=8.4
+ reportlab==3.6.2
+ requests==2.26.0
setuptools>=18.5
- sphinx
+ sphinx==4.3.0
# AWS
#boto3
diff --cc wger/urls.py
index 8d9e47a49,843b2ebc2..5dd33a746
--- a/wger/urls.py
+++ b/wger/urls.py
@@@ -236,7 -198,11 +236,12 @@@ urlpatterns +=
core_api_views.ApplicationVersionView.as_view({'get': 'get'}),
name='app_version'
),
+ path(
+ 'api/v2/min-app-version/',
+ core_api_views.RequiredApplicationVersionView.as_view({'get': 'get'}),
+ name='min_app_version'
+ ),
+ path('email/', include(email_urls)),
]
#