Skip to content

Commit

Permalink
Merge branch 'dev' into add-social-features
Browse files Browse the repository at this point in the history
  • Loading branch information
SamR1 committed Sep 3, 2023
2 parents b1c79c0 + 3fb444f commit f550729
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .env.docker
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ export WORKERS_PROCESSES=2
# export DEFAULT_STATICMAP=False

# Weather
# available weather API providers: darksky, visualcrossing
# available weather API providers: visualcrossing
# export WEATHER_API_PROVIDER=
# export WEATHER_API_KEY=
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ export SENDER_EMAIL=
# export DEFAULT_STATICMAP=False

# Weather
# available weather API providers: darksky, visualcrossing
# available weather API providers: visualcrossing
# export WEATHER_API_PROVIDER=
# export WEATHER_API_KEY=
2 changes: 1 addition & 1 deletion .github/workflows/.tests-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,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
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 &
Expand Down

0 comments on commit f550729

Please sign in to comment.