chores: remove france5

dataforgoodfr · Apr 22, 2024 · 13ca6c1 · 13ca6c1 · github-actions · Apr 22, 2024
1 parent fd81cb2
commit 13ca6c1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/deploy-main.yml b/.github/workflows/deploy-main.yml
@@ -41,6 +41,11 @@ jobs:
         git add pyproject.toml
         git commit -m "[no ci]: $PROJECT_VERSION bumping version"
         git push origin main
+
+  docker_build_push:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
     - name: Login to Scaleway Container Registry
       uses: docker/login-action@v3
       with:
@@ -60,11 +65,10 @@ jobs:
     - name: Push ingest_to_db Image
       run: docker push ${{ secrets.CONTAINER_REGISTRY_ENDPOINT }}/ingest_to_db
 
-    # - name: Build streamlit image
-    #   run: docker build -f Dockerfile_streamlit . -t ${{ secrets.CONTAINER_REGISTRY_ENDPOINT }}/streamlit
-    # - name: Push streamlit Image
-    #   run: docker push ${{ secrets.CONTAINER_REGISTRY_ENDPOINT }}/streamlit
-
+  scaleway_job_update:
+    runs-on: ubuntu-latest
+    needs: docker_build_push
+    steps:
     - name: update scaleway job definition with version mediatree_import
       uses: jawher/[email protected]
       env:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -116,7 +116,7 @@ services:
       # UPDATE: "true" # to batch update PG 
       # START_OFFSET: 100 # to batch update PG from a offset
       # START_DATE: 1704576615 # to test batch import 
-      # CHANNEL : france-info # to reimport only one channel
+      CHANNEL : france-info # to reimport only one channel
       MEDIATREE_USER : /run/secrets/username_api
       MEDIATREE_PASSWORD:  /run/secrets/pwd_api
       MEDIATREE_AUTH_URL: https://keywords.mediatree.fr/api/auth/token/

diff --git a/quotaclimat/data_processing/mediatree/api_import.py b/quotaclimat/data_processing/mediatree/api_import.py
@@ -66,7 +66,7 @@ def get_channels():
         channels = [default_channel]
     else: #prod  - all channels
         logging.warning("All channels are used")
-        return ["tf1", "france2", "fr3-idf", "france5", "m6", "arte", "d8", "bfmtv", "lci", "franceinfotv", "itele",
+        return ["tf1", "france2", "fr3-idf", "m6", "arte", "d8", "bfmtv", "lci", "franceinfotv", "itele",
         "europe1", "france-culture", "france-inter", "sud-radio", "rmc", "rtl", "france24", "france-info", "rfi"]
 
     return channels

diff --git a/test/sitemap/test_mediatree.py b/test/sitemap/test_mediatree.py
@@ -108,7 +108,7 @@ def test_get_channels():
     if(os.environ.get("ENV") == "docker"):
         assert get_channels() == ["france2"] # default for docker compose config
     else:
-        assert get_channels() == ["tf1", "france2", "fr3-idf", "france5", "m6", "arte", "d8", "bfmtv", "lci", "franceinfotv", "itele",
+        assert get_channels() == ["tf1", "france2", "fr3-idf", "m6", "arte", "d8", "bfmtv", "lci", "franceinfotv", "itele",
         "europe1", "france-culture", "france-inter", "sud-radio", "rmc", "rtl", "france24", "france-info", "rfi"]
 
 def test_save_to_pg_keyword():
File	Stmts	Miss	Cover	Missing
postgres
insert_data.py	44	7	84%	36–38, 57–59, 64
insert_existing_data_example.py	19	3	84%	25–27
postgres/schemas
models.py	110	15	86%	101–108, 119–120, 152–162
quotaclimat/data_ingestion
scrap_sitemap.py	134	17	87%	27–28, 33–34, 66–71, 95–97, 138–140, 202, 223–228
quotaclimat/data_ingestion/ingest_db
ingest_sitemap_in_db.py	55	37	33%	21–42, 45–58, 62–73
quotaclimat/data_ingestion/scrap_html
scrap_description_article.py	36	3	92%	19–20, 32
quotaclimat/data_processing/mediatree
api_import.py	179	106	41%	42–46, 51–59, 63–66, 72, 75–102, 108–123, 128–130, 145–157, 161–164, 168–174, 185–197, 200–204, 210, 234–235, 239, 243–262, 265–267
channel_program.py	68	10	85%	14–16, 27–29, 33–34, 48, 77
config.py	15	2	87%	7, 16
detect_keywords.py	192	4	98%	197, 250–252
utils.py	66	22	67%	19, 30–54, 57, 76–77
quotaclimat/utils
healthcheck_config.py	29	14	52%	22–24, 27–38
logger.py	24	11	54%	22–24, 28–37
sentry.py	10	2	80%	21–22
TOTAL	1043	253	76%