Merge branch 'dev' into add-social-features

.github/workflows/.tests-javascript.yml

@@ -5,12 +5,14 @@ on:
     paths: ['fittrackee_client/**']
   pull_request:
     paths: ['fittrackee_client/**']
+    types: [opened, synchronize, reopened]
 
 env:
   working-directory: fittrackee_client
 
 jobs:
   javascript:
+    if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.fork }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

.github/workflows/.tests-python.yml

@@ -2,9 +2,10 @@ name: Python CI
 
 on:
   push:
-    paths-ignore: ['docs/**', 'docsrc/**', 'fittrackee_client/**', '*.md']
+    paths-ignore: ['docs/**', 'docsrc/**', 'docker/**', 'fittrackee_client/**', '*.md']
   pull_request:
-    paths-ignore: ['docs/**', 'docsrc/**', 'fittrackee_client/**', '*.md']
+    paths-ignore: ['docs/**', 'docsrc/**', 'docker/**', 'fittrackee_client/**', '*.md']
+    types: [opened, synchronize, reopened]
 
 env:
   APP_SETTINGS: fittrackee.config.TestingConfig
@@ -16,6 +17,7 @@ env:
 
 jobs:
   python:
+    if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.fork }}
     name: python ${{ matrix.python-version }} (postgresql 15)
     runs-on: ubuntu-latest
     container: python:${{ matrix.python-version }}
@@ -33,7 +35,7 @@ jobs:
           --health-retries 5
     strategy:
       matrix:
-        python-version:  [ "3.8", "3.9", "3.10", "3.11" ]
+        python-version:  [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
     steps:
       - uses: actions/checkout@v3
       - name: Install Poetry and Dependencies
@@ -55,9 +57,10 @@ jobs:
         if: matrix.python-version == '3.11'
         run: mypy fittrackee
       - name: Pytest
-        run: pytest fittrackee -p no:warnings --cov fittrackee --cov-report term-missing
+        run: pytest fittrackee -p no:warnings --cov fittrackee --cov-report term-missing --maxfail=1
 
   postgresql:
+    if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.fork }}
     name: postgresql ${{ matrix.psql-version }} (python 3.11)
     runs-on: ubuntu-latest
     container: python:3.11
@@ -85,9 +88,10 @@ jobs:
           poetry config virtualenvs.create false
           poetry install --no-interaction --quiet
       - name: Pytest
-        run: pytest fittrackee -p no:warnings --cov fittrackee --cov-report term-missing
+        run: pytest fittrackee -p no:warnings --cov fittrackee --cov-report term-missing --maxfail=1
 
   end2end:
+    if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.fork }}
     name: e2e tests
     runs-on: ubuntu-latest
     needs: ["python"]
@@ -130,9 +134,10 @@ jobs:
           export TEST_APP_URL=http://$(hostname --ip-address):5000
           sleep 5
           nohup flask worker --processes=1 >> nohup.out 2>&1 &
-          pytest e2e --driver Remote --capability browserName firefox --selenium-host selenium --selenium-port 4444
+          pytest e2e --driver Remote --capability browserName firefox --selenium-host selenium --selenium-port 4444 --maxfail=1
 
   end2end_package:
+    if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.fork }}
     name: e2e tests with package
     runs-on: ubuntu-latest
     needs: ["python"]
@@ -183,4 +188,62 @@ jobs:
           export TEST_APP_URL=http://$(hostname --ip-address):5000
           sleep 5
           nohup flask worker --processes=1 >> nohup.out 2>&1 &
-          pytest e2e --driver Remote --capability browserName firefox --selenium-host selenium --selenium-port 4444
+          pytest e2e --driver Remote --capability browserName firefox --selenium-host selenium --selenium-port 4444 --maxfail=1
+
+  end2end_package_update:
+    if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.fork }}
+    name: e2e tests after update
+    runs-on: ubuntu-latest
+    needs: ["python"]
+    container: python:3.11
+    services:
+      postgres:
+        image: postgres:15
+        env:
+          POSTGRES_DB: fittrackee_test
+          POSTGRES_USER: fittrackee
+          POSTGRES_PASSWORD: fittrackee
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+      selenium:
+        image: selenium/standalone-firefox
+      mailhog:
+        image: mailhog/mailhog:latest
+      redis:
+        image: redis:latest
+    env:
+      APP_SETTINGS: fittrackee.config.End2EndTestingConfig
+      EMAIL_URL: "smtp://mailhog:1025"
+      REDIS_URL: "redis://redis:6379"
+      HOST: "0.0.0.0"
+      PORT: 5000
+    steps:
+      - uses: actions/checkout@v3
+      - name: Update pip and install build
+        run: python3 -m pip install --upgrade pip build
+      - name: Create and source virtual environment
+        run: | 
+          python3 -m venv .venv 
+          . .venv/bin/activate
+      - name: Install previous version of fittrackee from PyPI
+        run: python3 -m pip install fittrackee
+      - name: Run migrations
+        run: ftcli db upgrade
+      - name: Build fittrackee package
+        run: python3 -m build
+      - name: Install fittrackee package to update instance
+        run: python3 -m pip install dist/fittrackee-$(cat VERSION).tar.gz
+      - 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
+      - name: Start application and run tests with Selenium
+        run: |
+          setsid nohup fittrackee >> nohup.out 2>&1 &
+          export TEST_APP_URL=http://$(hostname --ip-address):5000
+          sleep 5
+          nohup flask worker --processes=1 >> nohup.out 2>&1 &
+          pytest e2e --driver Remote --capability browserName firefox --selenium-host selenium --selenium-port 4444 --maxfail=1

CHANGELOG.md

@@ -1,5 +1,39 @@
 # Change log
 
+## Version 0.7.24 (2023/10/04)
+
+### Bugs Fixed
+
+* [PR#433](https://github.com/SamR1/FitTrackee/pull/433) - Handle encoded password in EMAIL_URL
+
+### Translations
+
+* [PR#427](https://github.com/SamR1/FitTrackee/pull/427) - fix typos and translations + refacto
+* [PR#431](https://github.com/SamR1/FitTrackee/pull/431) - Translations update (Galician)
+
+### Misc
+
+* [PR#428](https://github.com/SamR1/FitTrackee/pull/428) - CI - Add PostgreSQL 16
+* [2bcff2e](https://github.com/SamR1/FitTrackee/commit/2bcff2edc7308f8ec4a59b30dd482025bf7396e7) - API - update Flask to 3.0+ 
+* [PR#436](https://github.com/SamR1/FitTrackee/pull/436) - CI - Add Python 3.12
+* [PR#438](https://github.com/SamR1/FitTrackee/pull/438) - CI - update workflows
+
+
+Translation status:
+- Dutch: 100%
+- English: 100%
+- French: 100%
+- Galician: 100%
+- German: 100%
+- Italian: 85%
+- Norwegian Bokmål: 35%
+- Polish: 100%
+- Spanish: 100%
+
+Thanks to the contributors:
+- @xmgz
+
+
 ## Version 0.7.23 (2023/09/14)
 
 ### Bugs Fixed

README.md

@@ -3,7 +3,7 @@
 
 [![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-2.3-brightgreen.svg)](http://flask.pocoo.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) 
 [![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.2-brightgreen.svg)](https://v3.vuejs.org/) 

VERSION

@@ -1 +1 @@
-0.7.23
+0.7.24

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: 588299d04c8b222827497475101d06ab
+config: 7e12fc6028f8808f4ecd970e6047ae43
 tags: 645f666f9bcd5a90fca523b33c5a78b7

docs/en/_sources/changelog.md.txt

@@ -1,5 +1,39 @@
 # Change log
 
+## Version 0.7.24 (2023/10/04)
+
+### Bugs Fixed
+
+* [PR#433](https://github.com/SamR1/FitTrackee/pull/433) - Handle encoded password in EMAIL_URL
+
+### Translations
+
+* [PR#427](https://github.com/SamR1/FitTrackee/pull/427) - fix typos and translations + refacto
+* [PR#431](https://github.com/SamR1/FitTrackee/pull/431) - Translations update (Galician)
+
+### Misc
+
+* [PR#428](https://github.com/SamR1/FitTrackee/pull/428) - CI - Add PostgreSQL 16
+* [2bcff2e](https://github.com/SamR1/FitTrackee/commit/2bcff2edc7308f8ec4a59b30dd482025bf7396e7) - API - update Flask to 3.0+ 
+* [PR#436](https://github.com/SamR1/FitTrackee/pull/436) - CI - Add Python 3.12
+* [PR#438](https://github.com/SamR1/FitTrackee/pull/438) - CI - update workflows
+
+
+Translation status:
+- Dutch: 100%
+- English: 100%
+- French: 100%
+- Galician: 100%
+- German: 100%
+- Italian: 85%
+- Norwegian Bokmål: 35%
+- Polish: 100%
+- Spanish: 100%
+
+Thanks to the contributors:
+- @xmgz
+
+
 ## Version 0.7.23 (2023/09/14)
 
 ### Bugs Fixed

docs/en/_sources/installation.rst.txt

@@ -287,6 +287,11 @@ For single-user instance, it is possible to disable email sending with an empty
 
 A `CLI <cli.html#ftcli-users-update>`__ is available to activate account, modify email and password and handle data export requests.
 
+.. versionchanged:: 0.7.24
+
+Password can be encoded if it contains special characters.
+For instance with password ``passwordwith@and&and?``, the encoded password will be: ``passwordwith%40and%26and%3F``.
+
 
 Map tile server
 ^^^^^^^^^^^^^^^
@@ -513,13 +518,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.7.23):
+-  Download the last release (for now, it is the release v0.7.24):
 
 .. code:: bash
 
-   $ wget https://github.com/SamR1/FitTrackee/archive/v0.7.23.tar.gz
-   $ tar -xzf v0.7.23.tar.gz
-   $ mv FitTrackee-0.7.23 FitTrackee
+   $ wget https://github.com/SamR1/FitTrackee/archive/v0.7.24.tar.gz
+   $ tar -xzf v0.7.24.tar.gz
+   $ mv FitTrackee-0.7.24 FitTrackee
    $ cd FitTrackee
 
 -  Create **.env** from example and update it
@@ -643,13 +648,13 @@ Prod environment
 
 - Change to the directory where FitTrackee directory is located
 
-- Download the last release (for now, it is the release v0.7.23) and overwrite existing files:
+- Download the last release (for now, it is the release v0.7.24) and overwrite existing files:
 
 .. code:: bash
 
-   $ wget https://github.com/SamR1/FitTrackee/archive/v0.7.23.tar.gz
-   $ tar -xzf v0.7.23.tar.gz
-   $ cp -R FitTrackee-0.7.23/* FitTrackee/
+   $ wget https://github.com/SamR1/FitTrackee/archive/v0.7.24.tar.gz
+   $ tar -xzf v0.7.24.tar.gz
+   $ cp -R FitTrackee-0.7.24/* FitTrackee/
    $ cd FitTrackee
 
 - Update **.env** if needed (see `Environment variables <installation.html#environment-variables>`__).

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.7.23',
+    VERSION: '0.7.24',
     LANGUAGE: 'en',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',

docs/en/api/auth.html

@@ -6,7 +6,7 @@
 <link rel="index" title="Index" href="../genindex.html" /><link rel="search" title="Search" href="../search.html" /><link rel="next" title="Configuration" href="configuration.html" /><link rel="prev" title="API documentation" href="index.html" />
 
     <!-- Generated with Sphinx 7.1.2 and Furo 2023.09.10 -->
-        <title>Authentication and account - FitTrackee 0.7.23 documentation</title>
+        <title>Authentication and account - FitTrackee 0.7.24 documentation</title>
       <link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=fa44fd50" />
     <link rel="stylesheet" type="text/css" href="../_static/styles/furo.css?v=135e06be" />
     <link rel="stylesheet" type="text/css" href="../_static/copybutton.css?v=76b2166b" />
@@ -126,7 +126,7 @@
       </label>
     </div>
     <div class="header-center">
-      <a href="../index.html"><div class="brand">FitTrackee 0.7.23
+      <a href="../index.html"><div class="brand">FitTrackee 0.7.24
  documentation</div></a>
     </div>
     <div class="header-right">
@@ -153,7 +153,7 @@
     <img class="sidebar-logo" src="../_static/ft-logo.png" alt="Logo"/>
   </div>
 
-  <span class="sidebar-brand-text">FitTrackee 0.7.23
+  <span class="sidebar-brand-text">FitTrackee 0.7.24
  documentation</span>
 
 </a><form class="sidebar-search-container" method="get" action="../search.html" role="search">
@@ -1586,7 +1586,7 @@ <h1>Authentication and account<a class="headerlink" href="#authentication-and-ac
 
     </aside>
   </div>
-</div><script data-url_root="../" id="documentation_options" src="../_static/documentation_options.js?v=36e31fbe"></script>
+</div><script data-url_root="../" id="documentation_options" src="../_static/documentation_options.js?v=fd6a8f73"></script>
     <script src="../_static/doctools.js?v=888ff710"></script>
     <script src="../_static/sphinx_highlight.js?v=4825356b"></script>
     <script src="../_static/scripts/furo.js?v=32e29ea5"></script>

docs/en/api/configuration.html

@@ -6,7 +6,7 @@
 <link rel="index" title="Index" href="../genindex.html" /><link rel="search" title="Search" href="../search.html" /><link rel="next" title="OAuth2" href="oauth2.html" /><link rel="prev" title="Authentication and account" href="auth.html" />
 
     <!-- Generated with Sphinx 7.1.2 and Furo 2023.09.10 -->
-        <title>Configuration - FitTrackee 0.7.23 documentation</title>
+        <title>Configuration - FitTrackee 0.7.24 documentation</title>
       <link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=fa44fd50" />
     <link rel="stylesheet" type="text/css" href="../_static/styles/furo.css?v=135e06be" />
     <link rel="stylesheet" type="text/css" href="../_static/copybutton.css?v=76b2166b" />
@@ -126,7 +126,7 @@
       </label>
     </div>
     <div class="header-center">
-      <a href="../index.html"><div class="brand">FitTrackee 0.7.23
+      <a href="../index.html"><div class="brand">FitTrackee 0.7.24
  documentation</div></a>
     </div>
     <div class="header-right">
@@ -153,7 +153,7 @@
     <img class="sidebar-logo" src="../_static/ft-logo.png" alt="Logo"/>
   </div>
 
-  <span class="sidebar-brand-text">FitTrackee 0.7.23
+  <span class="sidebar-brand-text">FitTrackee 0.7.24
  documentation</span>
 
 </a><form class="sidebar-search-container" method="get" action="../search.html" role="search">
@@ -257,7 +257,7 @@ <h1>Configuration<a class="headerlink" href="#configuration" title="Permalink to
 <span class="w">    </span><span class="nt">&quot;map_attribution&quot;</span><span class="p">:</span><span class="w"> </span><span class="s2">&quot;&amp;copy; &lt;a href=http://www.openstreetmap.org/copyright&gt;OpenStreetMap&lt;/a&gt; contributors&quot;</span><span class="p">,</span>
 <span class="w">    </span><span class="nt">&quot;privacy_policy&quot;</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span>
 <span class="w">    </span><span class="nt">&quot;privacy_policy_date&quot;</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span>
-<span class="w">    </span><span class="nt">&quot;version&quot;</span><span class="p">:</span><span class="w"> </span><span class="s2">&quot;0.7.23&quot;</span><span class="p">,</span>
+<span class="w">    </span><span class="nt">&quot;version&quot;</span><span class="p">:</span><span class="w"> </span><span class="s2">&quot;0.7.24&quot;</span><span class="p">,</span>
 <span class="w">    </span><span class="nt">&quot;weather_provider&quot;</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span>
 <span class="w">  </span><span class="p">},</span>
 <span class="w">  </span><span class="nt">&quot;status&quot;</span><span class="p">:</span><span class="w"> </span><span class="s2">&quot;success&quot;</span>
@@ -302,7 +302,7 @@ <h1>Configuration<a class="headerlink" href="#configuration" title="Permalink to
 <span class="w">    </span><span class="nt">&quot;map_attribution&quot;</span><span class="p">:</span><span class="w"> </span><span class="s2">&quot;&amp;copy; &lt;a href=http://www.openstreetmap.org/copyright&gt;OpenStreetMap&lt;/a&gt; contributors&quot;</span><span class="p">,</span>
 <span class="w">    </span><span class="nt">&quot;privacy_policy&quot;</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span>
 <span class="w">    </span><span class="nt">&quot;privacy_policy_date&quot;</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span>
-<span class="w">    </span><span class="nt">&quot;version&quot;</span><span class="p">:</span><span class="w"> </span><span class="s2">&quot;0.7.23&quot;</span><span class="p">,</span>
+<span class="w">    </span><span class="nt">&quot;version&quot;</span><span class="p">:</span><span class="w"> </span><span class="s2">&quot;0.7.24&quot;</span><span class="p">,</span>
 <span class="w">    </span><span class="nt">&quot;weather_provider&quot;</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span>
 <span class="w">  </span><span class="p">},</span>
 <span class="w">  </span><span class="nt">&quot;status&quot;</span><span class="p">:</span><span class="w"> </span><span class="s2">&quot;success&quot;</span>
@@ -428,7 +428,7 @@ <h1>Configuration<a class="headerlink" href="#configuration" title="Permalink to
 
     </aside>
   </div>
-</div><script data-url_root="../" id="documentation_options" src="../_static/documentation_options.js?v=36e31fbe"></script>
+</div><script data-url_root="../" id="documentation_options" src="../_static/documentation_options.js?v=fd6a8f73"></script>
     <script src="../_static/doctools.js?v=888ff710"></script>
     <script src="../_static/sphinx_highlight.js?v=4825356b"></script>
     <script src="../_static/scripts/furo.js?v=32e29ea5"></script>