[CAT-822] Update Python Version (#270)

* add python 3.10 to tox

* add 3.11

* add 3.12

* loosen dep requirements

---------

Co-authored-by: Nathanael Shim <[email protected]>

Author: nateshim-indico

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9.15
+FROM python:3.10.4
 
 ENV INDICO_HOST="dev-ci.us-east-2.indico-dev.indico.io"
 

indico/http/client.py

@@ -138,13 +138,12 @@ def _make_request(
         logger.debug(
             f"[{method}] {path}\n\t Headers: {headers}\n\tRequest Args:{request_kwargs}"
         )
-
         with self._handle_files(request_kwargs) as new_kwargs:
             response = getattr(self.request_session, method)(
                 f"{self.base_url}{path}",
                 headers=headers,
                 stream=True,
-                verify=self.config.verify_ssl,
+                verify=False if not self.config.verify_ssl or not self.request_session.verify else True,
                 **new_kwargs,
             )
 

setup.py

@@ -15,13 +15,13 @@
     url="https://github.com/IndicoDataSolutions/indico-client-python",
     author="indico",
     author_email="[email protected]",
-    tests_require=["pytest>=5.2.1", "requests-mock==1.8.0"],
+    tests_require=["pytest>=5.2.1", "requests-mock>=1.8.0"],
     install_requires=[
         "msgpack>=0.5.6",
         "msgpack-numpy==0.4.4.3",
         "numpy>=1.16.0",
         "Pillow>=6.2.0",
-        "requests==2.22.0",
+        "requests>=2.22.0",
         "setuptools>=41.4.0",
         "pandas>=1.0.3",
         'importlib-metadata ~= 1.0 ; python_version < "3.8"',

tests/unit/client/test_client.py

@@ -1,6 +1,7 @@
 import unittest.mock
 import pytest
 
+
 from indico.client import IndicoClient, HTTPRequest, HTTPMethod, GraphQLRequest
 from indico.config import IndicoConfig
 
@@ -96,7 +97,6 @@ def test_client_requests_params(indico_request, auth, indico_test_config):
         additional_matcher=lambda r: not r.verify,
         json={"data": {"datasets": []}},
     )
-
     response = client.call(
         GraphQLRequest(
             query="query list_datasets($ids: List(Int)) { datasets(ids: $ids) { id } }",

tox.Dockerfile

@@ -6,9 +6,9 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -yqq apt-tr
 #deadsnakes holds old versions of python for ubuntu
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -yqq software-properties-common && add-apt-repository ppa:deadsnakes/ppa
 
-RUN  DEBIAN_FRONTEND=noninteractive apt-get -yqq install  python3.7 python3.8 python3.9 python3-pip
+RUN  DEBIAN_FRONTEND=noninteractive apt-get -yqq install  python3.7 python3.8 python3.9 python3.10 python3.11 python3.12 python3-pip
 
-RUN pip3 install tox==3.22.0
+RUN pip3 install tox==4.11.3
 
 COPY . /indico-client
 WORKDIR /indico-client

tox.ini

@@ -1,13 +1,13 @@
 # content of: tox.ini , put in same dir as setup.py
 [tox]
-envlist = py38,py39
+envlist = py38,py39,py310,py311,py312
 
 [testenv]
 parallel_show_output = true
 # install pytest in the virtualenv where commands will be executed
-deps = 
+deps =
     pytest
-    requests-mock == 1.8.0
+    requests-mock >= 1.8.0
 commands =
     # NOTE: you can run any command line tool here - not just testsg
     pytest -sv tests/unit