Chores/dep updates - python 3.11 -> 3.12

* chores: dependencies * chores: jawher/[email protected]
dataforgoodfr · Oct 7, 2024 · 4d0ac94 · 4d0ac94 · github-actions · Oct 7, 2024
1 parent 5008535
commit 4d0ac94
Show file tree

Hide file tree

Showing 9 changed files with 526 additions and 518 deletions.
diff --git a/.github/workflows/deploy-main.yml b/.github/workflows/deploy-main.yml
@@ -11,7 +11,7 @@ on:
 
 
 env:
-  PYTHON_VERSION: '3.11'
+  PYTHON_VERSION: '3.12'
   POETRY_VERSION: '1.8.3'
 
 jobs:
@@ -61,7 +61,7 @@ jobs:
       run: docker push ${{ secrets.CONTAINER_REGISTRY_ENDPOINT }}/ingest_to_db
 
     - name: update scaleway job definition with version mediatree_import
-      uses: jawher/action-scw@v2.32.1
+      uses: jawher/action-scw@v2.34.0
       env:
         SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
         SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}

diff --git a/.github/workflows/scaleway-down.yml b/.github/workflows/scaleway-down.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Use CLI
-      uses: jawher/action-scw@v2.32.1
+      uses: jawher/action-scw@v2.34.0
       env:
         SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
         SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
@@ -25,7 +25,7 @@ jobs:
 
 
     - name: 0 instances
-      uses: jawher/action-scw@v2.32.1
+      uses: jawher/action-scw@v2.34.0
       env:
         SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
         SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}

diff --git a/.github/workflows/scaleway-start-import-job-update.yml b/.github/workflows/scaleway-start-import-job-update.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: start import job to reapply logic to all elements start_date matrix
-      uses: jawher/action-scw@v2.32.1
+      uses: jawher/action-scw@v2.34.0
       env:
         SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
         SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}

diff --git a/.github/workflows/scaleway-up.yml b/.github/workflows/scaleway-up.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Use CLI
-      uses: jawher/action-scw@v2.32.1
+      uses: jawher/action-scw@v2.34.0
       env:
         SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
         SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
@@ -24,7 +24,7 @@ jobs:
       run: echo "CONTAINER_ID=$(cat "${GITHUB_WORKSPACE}/scw.output" | jq -r '.[0].id')"  >> $GITHUB_ENV
 
     - name: start 1 instances
-      uses: jawher/action-scw@v2.32.1
+      uses: jawher/action-scw@v2.34.0
       env:
         SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
         SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,7 +4,7 @@ on:
   push:
 
 env:
-  PYTHON_VERSION: '3.11'
+  PYTHON_VERSION: '3.12'
   POETRY_VERSION: '1.8.3'
 
 jobs:

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 #from https://medium.com/@albertazzir/blazing-fast-python-docker-builds-with-poetry-a78a66f5aed0
-FROM python:3.11.9 as builder
+FROM python:3.12.7 as builder
 
 ENV VIRTUAL_ENV=/app/.venv
 
@@ -17,7 +17,7 @@ RUN pip install poetry==1.8.3
 RUN poetry install
 
 # The runtime image, used to just run the code provided its virtual environment
-FROM python:3.11.9-slim as runtime
+FROM python:3.12.7-slim as runtime
 
 WORKDIR /app
 

diff --git a/Dockerfile_api_import b/Dockerfile_api_import
@@ -1,5 +1,5 @@
 #from https://medium.com/@albertazzir/blazing-fast-python-docker-builds-with-poetry-a78a66f5aed0
-FROM python:3.11.9 as builder
+FROM python:3.12.7 as builder
 
 ENV VIRTUAL_ENV=/app/.venv
 
@@ -17,7 +17,7 @@ RUN pip install poetry==1.8.3
 RUN poetry install
 
 # The runtime image, used to just run the code provided its virtual environment
-FROM python:3.11.9-slim as runtime
+FROM python:3.12.7-slim as runtime
 
 WORKDIR /app
 

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -13,7 +13,7 @@ log_cli = 1
 log_cli_level = "INFO"
 
 [tool.poetry.dependencies]
-python = ">=3.11.0,<3.13.0"
+python = ">=3.11,<=3.13"
 pandas = "^2.2.3"
 advertools = "^0.14.1"
 xmltodict = "^0.13.0"
@@ -29,7 +29,6 @@ swifter = "^1.4.0"
 tenacity = "^8.2.3"
 sentry-sdk = "^2.13.0"
 modin = {extras = ["ray"], version = "^0.32.0"}
-numpy = "1.26.4"
 openpyxl = "^3.1.5"
 requests = "^2.32.3"
 [build-system]
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ on: @@
       push:
     env:
-      PYTHON_VERSION: '3.11'
+      PYTHON_VERSION: '3.12'
       POETRY_VERSION: '1.8.3'
     jobs:
@@ Expand Down @@
File	Stmts	Miss	Cover	Missing
postgres
insert_data.py	43	7	84%	36–38, 56–58, 63
insert_existing_data_example.py	19	3	84%	25–27
postgres/schemas
models.py	155	10	94%	126–133, 145–146, 211–212, 226–227
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	211	133	37%	44–48, 53–74, 78–81, 87, 90–132, 138–153, 158, 171–183, 187–193, 206–218, 221–225, 231, 266–267, 270–301, 304–306
channel_program.py	165	57	65%	25–27, 38–40, 57–58, 61–63, 102–103, 112, 128, 179–220
config.py	15	2	87%	7, 16
detect_keywords.py	209	8	96%	220, 278–285
update_pg_keywords.py	67	49	27%	15–108, 132, 135, 142–157, 180–206, 213
utils.py	79	25	68%	29–53, 56, 65, 86–87, 117–120
quotaclimat/utils
healthcheck_config.py	29	14	52%	22–24, 27–38
logger.py	24	11	54%	22–24, 28–37
sentry.py	11	2	82%	22–23
TOTAL	1278	378	70%