clean

.github/workflows/scraper.yaml

@@ -1,10 +1,10 @@
-name: Run scraper and update SQLite database
+name: Scraper
 
 on:
-#   push:
-#     branches: [ "main" ]
   schedule:
-    - cron: "45 02 * * THU"  # at 02:45 every Thursday
+    - cron: "45 02 * * THU"  # rerun at UTC 02:45 every Thursday
+  # allow manual trigger  
+  workflow_dispatch:
 
 permissions:
   actions: write

.github/workflows/cicd.yaml → .github/workflows/tests.yaml

@@ -1,4 +1,4 @@
-name: Run CI/CD pipeline 
+name: Tests
 
 on:
   push:

Makefile

@@ -1,6 +1,7 @@
 install:
 	@echo ">>> Installing dependencies"
-	pip install --upgrade pip && pip install -r requirements.txt
+	pip install --upgrade pip
+	pip install -r requirements.txt
 
 format:
 	@echo ">>> Formatting files using isort and Black"
@@ -13,10 +14,9 @@ lint:
 
 lint-container:
 	@echo ">>> Linting Dockerfile(s)"
-	docker run --rm -i hadolint/hadolint < Dockerfile
+	docker run --rm -i hadolint/hadolint < webapp/Dockerfile
 
-refactor:
-	format lint lint-container
+refactor: format lint lint-container
 
 coverage:
 	@echo ">>> Displaying pytest coverage report"

README.md

@@ -1,6 +1,7 @@
 # ⚽ Futsal Friend: Your Digital Futsal Companion
 
-[![Run CI/CD pipeline](https://github.com/sborms/futsalfriend/actions/workflows/cicd.yaml/badge.svg)](https://github.com/sborms/futsalfriend/actions/workflows/cicd.yaml)
+[![Tests](https://github.com/sborms/futsalfriend/actions/workflows/cicd.yaml/badge.svg)](https://github.com/sborms/futsalfriend/actions/workflows/tests.yaml)
+[![Scraper](https://github.com/sborms/futsalfriend/actions/workflows/scraper.yaml/badge.svg)](https://github.com/sborms/futsalfriend/actions/workflows/scraper.yaml)
 
 For those in love with futsal as a way to enjoy sports and to maximize time with friends.
 

requirements.txt

@@ -22,4 +22,4 @@ sqlalchemy
 geopy
 langchain
 openai
-hugchat
+# hugchat

scraper/main.py

@@ -159,7 +159,6 @@ def store(config, dict_tables, log_main):
     log.info(f"Running script from {DIR_SCRIPT}")
 
     config = DataStorage.load_json(f"{DIR_SCRIPT}/config/config.json")
-    # config = DataStorage.load_json(f"{DIR_SCRIPT}/config/config_for_testing.json")
     log.info("Config loaded")
 
     dict_tables = scrape(config, log_main=log)