Merge branch 'SamR1:master' into master

DavidHenryThoreau · May 12, 2024 · 12a911d · 12a911d
2 parents 62174ed + 5cdc0c5
commit 12a911d
Show file tree

Hide file tree

Showing 170 changed files with 8,328 additions and 4,907 deletions.
diff --git a/.flake8 b/.flake8
diff --git a/.github/workflows/.tests-python.yml b/.github/workflows/.tests-python.yml
@@ -46,12 +46,9 @@ jobs:
       - name: Bandit
         if: matrix.python-version == '3.11'
         run: bandit -r fittrackee -c pyproject.toml
-      - name: Lint (isort & black)
+      - name: Lint
         if: matrix.python-version == '3.11'
-        run: pytest --isort --black -m "isort or black" fittrackee e2e --ignore=fittrackee/migrations -p no:warnings
-      - name: Lint (flake8)
-        if: matrix.python-version == '3.11'
-        run: flake8 fittrackee e2e
+        run: ruff check fittrackee e2e
       - name: Mypy
         if: matrix.python-version == '3.11'
         run: mypy fittrackee
@@ -180,7 +177,7 @@ jobs:
       - name: Run migrations
         run: ftcli db upgrade
       - name: Install pytest and selenium
-        run: python3 -m pip install pytest==7.4.0 pytest-selenium==4.0.1 selenium==4.9.0 pytest-html==3.2.0
+        run: python3 -m pip install pytest==8.2.0 pytest-selenium==4.1.0 selenium==4.20.0 pytest-html==4.1.1
       - name: Start application and run tests with Selenium
         run: |
           setsid nohup fittrackee >> nohup.out 2>&1 &
@@ -238,7 +235,7 @@ jobs:
       - name: Run migrations to update database
         run: ftcli db upgrade
       - name: Install pytest and selenium
-        run: python3 -m pip install pytest==7.4.0 pytest-selenium==4.0.1 selenium==4.9.0 pytest-html==3.2.0
+        run: python3 -m pip install pytest==8.2.0 pytest-selenium==4.1.0 selenium==4.20.0 pytest-html==4.1.1
       - name: Start application and run tests with Selenium
         run: |
           setsid nohup fittrackee >> nohup.out 2>&1 &

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,66 @@
 # Change log
 
+## Version 0.8.3 (2024/05/09)
+
+### Bugs Fixed
+
+* [#546](https://github.com/SamR1/FitTrackee/issues/546) - workout data are not refreshed after displaying segment
+
+### Translations
+
+* [PR#545](https://github.com/SamR1/FitTrackee/pull/545) - Translations update (Basque, Czech)
+
+Translation status:
+- Basque: 100%
+- Czech: 25%
+- Dutch: 98%
+- English: 100%
+- French: 100%
+- Galician: 100%
+- German: 100%
+- Italian: 74%
+- Norwegian Bokmål: 53%
+- Polish: 88%
+- Spanish: 100%
+
+
+Thanks to the contributors:
+- @jmlich
+- @urtzai
+
+
+## Version 0.8.2 (2024/05/08)
+
+### Translations
+
+* [PR#540](https://github.com/SamR1/FitTrackee/pull/540) - Translations update (German)
+* [PR#542](https://github.com/SamR1/FitTrackee/pull/542) - Translations update (Czech)
+* [PR#544](https://github.com/SamR1/FitTrackee/pull/544) - Translations update (German, Czech)
+
+Translation status:
+- Basque: 88%
+- Czech: 25%
+- Dutch: 98%
+- English: 100%
+- French: 100%
+- Galician: 100%
+- German: 100%
+- Italian: 74%
+- Norwegian Bokmål: 53%
+- Polish: 88%
+- Spanish: 100%
+
+### Misc
+
+* [PR#543](https://github.com/SamR1/FitTrackee/pull/543) - tools - replace black, flake8 and isort with ruff
+
+
+Thanks to the contributors:
+- @jmlich
+- @OndrejZivny
+- @qwerty287
+
+
 ## Version 0.8.1 (2024/05/01)
 
 ### Features and enhancements

diff --git a/Makefile b/Makefile
@@ -202,12 +202,11 @@ lint-client-fix:
 	cd fittrackee_client && $(NPM) format
 
 lint-python:
-	$(PYTEST) --isort --black -m "isort or black" fittrackee e2e --ignore=fittrackee/migrations
-	echo 'Running flake8...'
-	$(FLAKE8) fittrackee e2e
+	$(RUFF) check fittrackee e2e
 
 lint-python-fix:
-	$(BLACK) fittrackee e2e
+	$(RUFF) check --fix fittrackee e2e
+	$(RUFF) format fittrackee e2e
 
 mail:
 	docker run -d -e "MH_STORAGE=maildir" -v /tmp/maildir:/maildir -p 1025:1025 -p 8025:8025 mailhog/mailhog

diff --git a/Makefile.config b/Makefile.config
@@ -21,8 +21,7 @@ POETRY = poetry
 FLASK = $(VENV)/bin/flask
 PYTEST = $(VENV)/bin/py.test -c pyproject.toml -W ignore::DeprecationWarning
 GUNICORN = $(VENV)/bin/gunicorn
-BLACK = $(VENV)/bin/black
-FLAKE8 = $(VENV)/bin/flake8
+RUFF = $(VENV)/bin/ruff
 MYPY = $(VENV)/bin/mypy
 BANDIT = $(VENV)/bin/bandit
 PYBABEL = $(VENV)/bin/pybabel

diff --git a/README.md b/README.md
@@ -4,11 +4,11 @@
 [![PyPI version](https://img.shields.io/pypi/v/fittrackee.svg)](https://pypi.org/project/fittrackee/) 
 [![Python Version](https://img.shields.io/badge/python-3.8+-brightgreen.svg)](https://python.org)
 [![Flask Version](https://img.shields.io/badge/flask-3.0-brightgreen.svg)](http://flask.pocoo.org/) 
-[![code style: black](https://img.shields.io/badge/code%20style-black-black)](https://github.com/psf/black) 
+[![code formatter: ruff](https://img.shields.io/badge/code%20formatter-ruff-d7ff64)](https://github.com/psf/black) 
 [![type check: mypy](https://img.shields.io/badge/type%20check-mypy-blue)](http://mypy-lang.org/)  
 [![Vue Version](https://img.shields.io/badge/vue-3.4-brightgreen.svg)](https://v3.vuejs.org/) 
 [![Typescript Version](https://img.shields.io/npm/types/typescript)](https://www.typescriptlang.org/) 
-[![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier)  
+[![code formatter: prettier](https://img.shields.io/badge/code%20formatter-prettier-ff69b4.svg)](https://github.com/prettier/prettier)  
 [![pipeline status](https://github.com/SamR1/FitTrackee/actions/workflows/.tests-python.yml/badge.svg)](https://github.com/SamR1/FitTrackee/actions/workflows/.tests-python.yml)
 [![pipeline status](https://github.com/SamR1/FitTrackee/actions/workflows/.tests-javascript.yml/badge.svg)](https://github.com/SamR1/FitTrackee/actions/workflows/.tests-javascript.yml)
 [![translation status](https://hosted.weblate.org/widgets/fittrackee/-/svg-badge.svg)](https://hosted.weblate.org/engage/fittrackee/)  
@@ -41,6 +41,6 @@ Map data from [OpenStreetMap](https://www.openstreetmap.org).
 
 ## Translations
 
-<a href="https://hosted.weblate.org/engage/fittrackee/">
-<img src="https://hosted.weblate.org/widget/fittrackee/horizontal-auto.svg" alt="Translation status" />
-</a>
+FitTrackee uses [Weblate](https://hosted.weblate.org/engage/fittrackee/) for translation management.
+
+[![Translation status](https://hosted.weblate.org/widget/fittrackee/multi-auto.svg)](https://hosted.weblate.org/engage/fittrackee/)
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.8.1
+0.8.3
diff --git a/docs/en/.buildinfo b/docs/en/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: e7c7bda9de824e2c5d93e8b9caaf022f
+config: 59787cf4ace2c9f663c8f58093a1b21f
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/en/_images/fittrackee_screenshot-01.png b/docs/en/_images/fittrackee_screenshot-01.png
diff --git a/docs/en/_images/fittrackee_screenshot-02.png b/docs/en/_images/fittrackee_screenshot-02.png
diff --git a/docs/en/_images/fittrackee_screenshot-03.png b/docs/en/_images/fittrackee_screenshot-03.png
diff --git a/docs/en/_images/fittrackee_screenshot-04.png b/docs/en/_images/fittrackee_screenshot-04.png
diff --git a/docs/en/_images/fittrackee_screenshot-05.png b/docs/en/_images/fittrackee_screenshot-05.png
diff --git a/docs/en/_images/fittrackee_screenshot-06.png b/docs/en/_images/fittrackee_screenshot-06.png
diff --git a/docs/en/_images/fittrackee_screenshot-07.png b/docs/en/_images/fittrackee_screenshot-07.png
diff --git a/docs/en/_images/fittrackee_screenshot-08.png b/docs/en/_images/fittrackee_screenshot-08.png
diff --git a/docs/en/_images/fittrackee_screenshot-09.png b/docs/en/_images/fittrackee_screenshot-09.png
diff --git a/docs/en/_images/fittrackee_screenshot-10.png b/docs/en/_images/fittrackee_screenshot-10.png
diff --git a/docs/en/_sources/changelog.md.txt b/docs/en/_sources/changelog.md.txt
@@ -1,5 +1,66 @@
 # Change log
 
+## Version 0.8.3 (2024/05/09)
+
+### Bugs Fixed
+
+* [#546](https://github.com/SamR1/FitTrackee/issues/546) - workout data are not refreshed after displaying segment
+
+### Translations
+
+* [PR#545](https://github.com/SamR1/FitTrackee/pull/545) - Translations update (Basque, Czech)
+
+Translation status:
+- Basque: 100%
+- Czech: 25%
+- Dutch: 98%
+- English: 100%
+- French: 100%
+- Galician: 100%
+- German: 100%
+- Italian: 74%
+- Norwegian Bokmål: 53%
+- Polish: 88%
+- Spanish: 100%
+
+
+Thanks to the contributors:
+- @jmlich
+- @urtzai
+
+
+## Version 0.8.2 (2024/05/08)
+
+### Translations
+
+* [PR#540](https://github.com/SamR1/FitTrackee/pull/540) - Translations update (German)
+* [PR#542](https://github.com/SamR1/FitTrackee/pull/542) - Translations update (Czech)
+* [PR#544](https://github.com/SamR1/FitTrackee/pull/544) - Translations update (German, Czech)
+
+Translation status:
+- Basque: 88%
+- Czech: 25%
+- Dutch: 98%
+- English: 100%
+- French: 100%
+- Galician: 100%
+- German: 100%
+- Italian: 74%
+- Norwegian Bokmål: 53%
+- Polish: 88%
+- Spanish: 100%
+
+### Misc
+
+* [PR#543](https://github.com/SamR1/FitTrackee/pull/543) - tools - replace black, flake8 and isort with ruff
+
+
+Thanks to the contributors:
+- @jmlich
+- @OndrejZivny
+- @qwerty287
+
+
 ## Version 0.8.1 (2024/05/01)
 
 ### Features and enhancements

diff --git a/docs/en/_sources/features.rst.txt b/docs/en/_sources/features.rst.txt
@@ -184,7 +184,7 @@ OAuth Apps
 ^^^^^^^^^^
 (*new in 0.7.0*)
 
-- A user can create `clients <apps.html>`__ for third-party applications.
+- A user can create `clients <oauth.html>`__ for third-party applications.
 
 Administration
 ^^^^^^^^^^^^^^

diff --git a/docs/en/_sources/installation.rst.txt b/docs/en/_sources/installation.rst.txt
@@ -529,13 +529,13 @@ Production environment
 .. warning::
     | Note that FitTrackee is under heavy development, some features may be unstable.
 
--  Download the last release (for now, it is the release v0.8.0):
+-  Download the last release (for now, it is the release v0.8.3):
 
 .. code:: bash
 
-   $ wget https://github.com/SamR1/FitTrackee/archive/v0.8.0.tar.gz
-   $ tar -xzf v0.8.0.tar.gz
-   $ mv FitTrackee-0.8.0 FitTrackee
+   $ wget https://github.com/SamR1/FitTrackee/archive/v0.8.3.tar.gz
+   $ tar -xzf v0.8.3.tar.gz
+   $ mv FitTrackee-0.8.3 FitTrackee
    $ cd FitTrackee
 
 -  Create **.env** from example and update it
@@ -666,13 +666,13 @@ Prod environment
 
 - Change to the directory where FitTrackee directory is located
 
-- Download the last release (for now, it is the release v0.8.0) and overwrite existing files:
+- Download the last release (for now, it is the release v0.8.3) and overwrite existing files:
 
 .. code:: bash
 
-   $ wget https://github.com/SamR1/FitTrackee/archive/v0.8.0.tar.gz
-   $ tar -xzf v0.8.0.tar.gz
-   $ cp -R FitTrackee-0.8.0/* FitTrackee/
+   $ wget https://github.com/SamR1/FitTrackee/archive/v0.8.3.tar.gz
+   $ tar -xzf v0.8.3.tar.gz
+   $ cp -R FitTrackee-0.8.3/* FitTrackee/
    $ cd FitTrackee
 
 - Update **.env** if needed (see `Environment variables <installation.html#environment-variables>`__).

diff --git a/docs/en/_static/css/custom.css b/docs/en/_static/css/custom.css
@@ -20,7 +20,7 @@ article figure img {
   background-color: var(--color-sidebar-item-background);
   border-top: solid 1px var(--color-sidebar-background-border);
   width: 100%;
-  z-index: 1;
+  z-index: 10;
   left: 0;
   bottom: 0;
 }

diff --git a/docs/en/_static/documentation_options.js b/docs/en/_static/documentation_options.js
@@ -1,6 +1,6 @@
 var DOCUMENTATION_OPTIONS = {
     URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
-    VERSION: '0.8.1',
+    VERSION: '0.8.3',
     LANGUAGE: 'en',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',

diff --git a/docs/en/_static/styles/furo.css b/docs/en/_static/styles/furo.css
diff --git a/docs/en/_static/styles/furo.css.map b/docs/en/_static/styles/furo.css.map