Merge pull request #96 from telefonicasc/update-python12-prelanding

Update python12 prelanding

Author: arcosa

.github/workflows/unit-testing.yml

@@ -4,31 +4,33 @@ name: Unit testing
 
 on:
   push:
-    branches: [ "master" ]
+    branches: ["master"]
   pull_request:
-    branches: [ "master" ]
+    branches: ["master"]
 
 permissions:
   contents: read
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.8, 3.12]
 
     # FIXME: it would be great to use cache to avoid re-creating the virtualenv
-    # and installing dependencies every time. We know the syphar/restore-virtualenv@v1 and 
+    # and installing dependencies every time. We know the syphar/restore-virtualenv@v1 and
     # syphar/restore-pip-download-cache@v1 actions, but it seems it only works if
     # dependencies are in requeriments.txt file (and in this case we have them in setup.py)
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v3
-      with:
-        python-version: "3.8"
-    - name: Install pytest tool
-      run: pip install pytest==7.2.0
-    - name: Install library dependencies
-      run: pip install -e python-lib/tc_etl_lib
-    - name: Test with pytest
-      run: pytest -v python-lib/tc_etl_lib/
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install pytest tool
+        run: pip install pytest==8.3.4
+      - name: Install library dependencies
+        run: pip install -e python-lib/tc_etl_lib
+      - name: Test with pytest
+        run: pytest -v python-lib/tc_etl_lib/

python-lib/tc_etl_lib/README.md

@@ -449,15 +449,15 @@ $ (venv)$ pip install -e python-lib/tc_etl_lib  # directorio en el que está set
 Adicionalmente, instalar las herramientas necesarias para ejecutar los tests:
 
 ```
-pip install pytest==7.2.0 coverage==7.0.5
+pip install pytest==8.3.4 coverage==7.6.9
 ```
 
 Para ejecutar un solo fichero de tests:
 
 ```
 $ (venv)$ pytest python-lib/tc_etl_lib/tc_etl_lib/test_store.py
 ================================================================ test session starts =================================================================
-platform linux -- Python 3.9.2, pytest-7.2.0, pluggy-1.0.0
+platform linux -- Python 3.9.2, pytest-8.3.4, pluggy-1.0.0
 rootdir: /home/fermin/src/etl-framework/python-lib/tc_etl_lib
 collected 7 items                                                                                                                                    
 
@@ -471,7 +471,7 @@ Para ejecutar todos los tests se puede utilizar `pytest` sin parámetros:
 ```
 $ (venv)$ pytest
 ================================================================ test session starts =================================================================
-platform linux -- Python 3.9.2, pytest-7.2.0, pluggy-1.0.0
+platform linux -- Python 3.9.2, pytest-8.3.4, pluggy-1.0.0
 rootdir: /home/fermin/src/etl-framework/python-lib/tc_etl_lib
 collected 7 items                                                                                                                                    
 
@@ -508,6 +508,10 @@ TOTAL                        403    221    45%
 
 ## Changelog
 
+- Add: support for Python 3.12 (keeping also compatibility with Python 3.8)
+- Fix: upgrade requests from 2.21.0 to 2.25.1 (for Python 3.8 case)
+- Fix: upgrade urllib3 from 1.24.1 to 1.26.16 (for Python 3.8 case)
+
 0.13.0 (Jun 26th, 2024)
 
 - Fix: anchor numpy version to 1.24.4 (latest compatible with python 3.8 and pandas < 2.2.2) ([#89](https://github.com/telefonicasc/etl-framework/issues/89))

python-lib/tc_etl_lib/setup.py

@@ -35,9 +35,10 @@
 LONG_DESC_TYPE = "text/markdown"
 
 #Paquetes necesarios para que funcione la librería. Se instalarán a la vez si no lo tuvieras ya instalado
+#Dos listas separadas (para Python >=3.12 y para Python <3.12)
 INSTALL_REQUIRES = [
-    'requests==2.21.0',
-    'urllib3==1.24.1',
+    'requests==2.25.1',
+    'urllib3==1.26.16',
     'psycopg2-binary>=2.9.5',
     'pandas==2.0.3',
     # Pandas < 2.2.2 requiere numpy < 2.0.0, ver https://pandas.pydata.org/docs/whatsnew/v2.2.2.html
@@ -47,6 +48,13 @@
     # La última release de numpy compatible con python 3.8 es 1.24.4
     'numpy==1.24.4'
 ]
+INSTALL_REQUIRES_PYTHON_3_12 = [
+    'requests==2.28.2',
+    'urllib3==1.26.16',
+    'psycopg2-binary>=2.9.5',
+    'pandas==2.2.2',
+    'numpy==2.2.0'
+]
 
 setup(
     name=PACKAGE_NAME,
@@ -57,7 +65,10 @@
     author=AUTHOR,
     author_email=AUTHOR_EMAIL,
     url=URL,
-    install_requires=INSTALL_REQUIRES,
+    extras_require={
+        ':python_version<"3.12"': INSTALL_REQUIRES,
+        ':python_version>="3.12"': INSTALL_REQUIRES_PYTHON_3_12
+    },
     license=LICENSE,
     packages=find_packages(),
     include_package_data=True

python-lib/tc_etl_lib/tc_etl_lib/cb.py

@@ -403,7 +403,7 @@ def __batch_creation(self, *, service: str = None, subservice: str = None, auth:
             read=self.post_retry_connect,
             backoff_factor=self.post_retry_backoff_factor,
             status_forcelist=(429, 500, 502, 503, 504),
-            method_whitelist=('HEAD', 'GET', 'OPTIONS', 'POST')
+            allowed_methods=('HEAD', 'GET', 'OPTIONS', 'POST')
         )
 
         adapter = HTTPAdapter(max_retries=retry_strategy)

python-lib/tc_etl_lib/tc_etl_lib/iota.py

@@ -102,7 +102,7 @@ def send_http(self,
             read=self.post_retry_connect,
             backoff_factor=self.post_retry_backoff_factor,
             status_forcelist=(429, 500, 502, 503, 504),
-            method_whitelist=('HEAD', 'GET', 'OPTIONS', 'POST')
+            allowed_methods=('HEAD', 'GET', 'OPTIONS', 'POST')
         )
 
         adapter = HTTPAdapter(max_retries=retry_strategy)