Merge branch 'LBB-22/upgrade_python' into 'LBB-23/upgrade_flask'

♻️ upgrade python to v3.10

See merge request lbb/lbb!635

.github/workflows/lbb-ci.yml

@@ -4,9 +4,14 @@ name: LBB CI
 
 on:
   push:
-    branches: [ "master"]
+    branches: [ "*"]
   pull_request:
     branches: [ "master"]
+  workflow_dispatch:
+    inputs:
+      git-ref:
+        description: Git Ref (Optional)    
+        required: false
 
 jobs:
   tests:
@@ -15,7 +20,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.6.8]
+        python-version: [3.10.4]
 
     steps:
     - uses: actions/checkout@v3

Makefile

@@ -215,53 +215,53 @@ start-locust-against-localhost:
 
 # Tests
 # -----
-NOSETESTS_OPTS ?= 
-NOSETESTS = nosetests -s $(NOSETESTS_OPTS)
+PYTEST_OPTS ?= -vx
+PYTEST = pytest $(PYTEST_OPTS)
 TESTS = 	labonneboite/tests/app/ \
 			labonneboite/tests/web/ \
 			labonneboite/tests/scripts/
 
 test-unit: clean-pyc rebuild-data-test
-	LBB_ENV=test $(NOSETESTS) ${TESTS}
+	LBB_ENV=test $(PYTEST) ${TESTS}
 
 test: test-unit test-selenium test-integration
 
 check-all: test-all
 
 test-app:
-	LBB_ENV=test $(NOSETESTS) labonneboite/tests/app
+	LBB_ENV=test $(PYTEST) labonneboite/tests/app
 
 test-api:
-	LBB_ENV=test $(NOSETESTS) labonneboite/tests/web/api
+	LBB_ENV=test $(PYTEST) labonneboite/tests/web/api
 
 test-front:
-	LBB_ENV=test $(NOSETESTS) labonneboite/tests/web/front
+	LBB_ENV=test $(PYTEST) labonneboite/tests/web/front
 
 test-web: test-api test-front test-web-integration
 
 test-scripts:
-	LBB_ENV=test $(NOSETESTS) labonneboite/tests/scripts
+	LBB_ENV=test $(PYTEST) labonneboite/tests/scripts
 
 test-integration: clear-data-test database-test populate-data-test
-	LBB_ENV=test $(NOSETESTS) labonneboite/tests/integration
+	LBB_ENV=test $(PYTEST) labonneboite/tests/integration
 
 test-selenium: clear-data-test database-test populate-data-test-selenium
-	LBB_ENV=test SELENIUM_IS_SETUP=1 $(NOSETESTS) labonneboite/tests/selenium
+	LBB_ENV=test SELENIUM_IS_SETUP=1 $(PYTEST) labonneboite/tests/selenium
 
 # Convenient reminder about how to run a specific test manually.
 test-custom:
 	@echo "To run a specific test, run for example:"
 	@echo
-	@echo "    $$ LBB_ENV=test nosetests -s labonneboite/tests/web/api/test_api.py"
+	@echo "    $$ LBB_ENV=test pytest -s labonneboite/tests/web/api/test_api.py"
 	@echo
 	@echo "and you can even run a specific method, here are several examples:"
 	@echo
-	@echo "    $$ LBB_ENV=test nosetests -s labonneboite/tests/web/api/test_api.py:ApiCompanyListTest.test_query_returns_scores_adjusted_to_rome_code_context"
-	@echo "    $$ LBB_ENV=test nosetests -s labonneboite/tests/web/api/test_api.py:ApiOffersOfficesListTest"
-	@echo "    $$ LBB_ENV=test nosetests -s labonneboite/tests/web/front/test_routes.py"
-	@echo "    $$ LBB_ENV=test nosetests -s labonneboite/tests/app/test_suggest_locations.py"
-	@echo "    $$ LBB_ENV=test nosetests -s labonneboite/tests/scripts/test_create_index.py:DeleteOfficeAdminTest.test_office_admin_add"
-	@echo "    $$ LBB_ENV=test nosetests -s labonneboite/tests/selenium/test_search_selecting_car.py:TestSearchSelectingCar.test_commute_time_is_displayed"
+	@echo "    $$ LBB_ENV=test pytest -s labonneboite/tests/web/api/test_api.py:ApiCompanyListTest.test_query_returns_scores_adjusted_to_rome_code_context"
+	@echo "    $$ LBB_ENV=test pytest -s labonneboite/tests/web/api/test_api.py:ApiOffersOfficesListTest"
+	@echo "    $$ LBB_ENV=test pytest -s labonneboite/tests/web/front/test_routes.py"
+	@echo "    $$ LBB_ENV=test pytest -s labonneboite/tests/app/test_suggest_locations.py"
+	@echo "    $$ LBB_ENV=test pytest -s labonneboite/tests/scripts/test_create_index.py:DeleteOfficeAdminTest.test_office_admin_add"
+	@echo "    $$ LBB_ENV=test pytest -s labonneboite/tests/selenium/test_search_selecting_car.py:TestSearchSelectingCar.test_commute_time_is_displayed"
 	@echo
 	@echo "Note that you can set the env var `NOSE_NOCAPTURE=1` to keep logs in the console"
 

README.md

@@ -81,7 +81,7 @@ La Bonne Boite is a [web site](https://labonneboite.pole-emploi.fr) and an [API]
 
 ### Install OS requirements:
 
-- python == 3.6.8
+- python == 3.10.4
 - docker-compose
 - mysql-client
 - libmysqlclient-dev
@@ -108,19 +108,19 @@ On fedora
 
 You will also need to install docker and docker-compose. Follow the instructions related to your particular OS from the [official Docker documentation](https://docs.docker.com/install/).
 
-### Create a virtualenv for Python 3.6
+### Create a virtualenv for Python 3.10
 
-For now, La Bonne Boite runs in production under Python 3.6.8. You are going to have to create a virtualenv that runs this specific version of Python.
+For now, La Bonne Boite runs in production under Python 3.10.4. You are going to have to create a virtualenv that runs this specific version of Python.
 
-    $ wget https://www.python.org/ftp/python/3.6.8/Python-3.6.8.tgz
-    $ tar -xvzf Python-3.6.8.tgz
-    $ cd Python-3.6.8
+    $ wget https://www.python.org/ftp/python/3.10.4/Python-3.10.4.tgz
+    $ tar -xvzf Python-3.10.4.tgz
+    $ cd Python-3.10.4
     $ ./configure --prefix=/usr/local --enable-loadable-sqlite-extensions
     $ sudo make altinstall
 
 Create an [isolated Python environment](https://virtualenv.pypa.io/), for example using [virtualenvwrapper](https://virtualenvwrapper.readthedocs.io/):
 
-    $ mkvirtualenv --python=`which python3.6` lbb
+    $ mkvirtualenv --python=`which python3.10` lbb
     $ workon lbb
 
 You might need to add `labonneboite` base directory to the Python path. This has to be run only once. One way to do it using `virtualenvwrapper`:

labonneboite/common/load_data.py

@@ -1,7 +1,6 @@
 import os
 import pickle
 import csv
-import pandas as pd
 import math
 
 from functools import lru_cache, reduce

labonneboite/common/scoring.py

@@ -1,6 +1,7 @@
 import math
 from functools import lru_cache
 from typing import Optional, Union
+from decimal import Decimal
 
 from labonneboite.common import mapping as mapping_util
 from labonneboite.common.conf import settings
@@ -124,6 +125,10 @@ def get_hirings_from_score(score: Score) -> Hiring:
     """
     does exactly the reverse operation of get_score_from_hirings
     """
+
+    if (isinstance(score, Decimal)):
+        score = int(score)
+
     if score <= 50:
         hirings = settings.SCORE_50_HIRINGS * score / 50.0
     elif score <= 60: