Merge branch 'dev' into add-social-features

SamR1 · Oct 4, 2023 · cc85331 · cc85331
2 parents cce86a9 + 22c29bf
commit cc85331
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/.github/workflows/.tests-javascript.yml b/.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

diff --git a/.github/workflows/.tests-python.yml b/.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,9 +188,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_update:
+    if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.fork }}
     name: e2e tests after update
     runs-on: ubuntu-latest
     needs: ["python"]
@@ -240,4 +246,4 @@ 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
diff --git a/pyproject.toml b/pyproject.toml
@@ -18,6 +18,7 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Programming Language :: JavaScript"
 ]
 exclude = ["fittrackee/tests"]