Merge pull request #1513 from grycap/devel

Devel
grycap · Nov 29, 2023 · d3af705 · d3af705
2 parents ab994ce + 1dbff6e
commit d3af705
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/contextualization/conf-ansible.yml b/contextualization/conf-ansible.yml
@@ -120,18 +120,24 @@
 
   ######################################### Use pip to enable to set the version #############################################
 
-    # Version over 21 does not work with python 3.5 or older
-    - name: Upgrade pip in py3.5
+    # Version over 21 does not work with python 3.6 or older
+    - name: Upgrade pip in py3.6-
       pip:
         name: pip>18.0,<21.0
         executable: pip3
       when: ansible_python_version is version('3.7', '<')
 
-    - name: Upgrade pip in py3.6-py3.10
+    - name: Upgrade pip in py3.7-py3.8
       pip:
         name: pip>20.0
         executable: pip3
-      when: ansible_python_version is version('3.7', '>=') and ansible_python_version is version('3.11', '<')
+      when: ansible_python_version is version('3.7', '>=') and ansible_python_version is version('3.9', '<')
+
+    - name: Upgrade pip in py3.9-py3.10
+      pip:
+        name: pip>=22.0
+        executable: pip3
+      when: ansible_python_version is version('3.9', '>=') and ansible_python_version is version('3.11', '<')
 
     # Version 66 (#2497) fails
     - name: Upgrade setuptools with Pip in py3.11-

diff --git a/docker-devel/Dockerfile b/docker-devel/Dockerfile
@@ -14,7 +14,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y python3 python3
 RUN apt-get update && apt-get install --no-install-recommends -y python3-setuptools python3-pip git && \
      pip3 install msrest msrestazure azure-common azure-mgmt-storage azure-mgmt-compute azure-mgmt-network azure-mgmt-resource azure-mgmt-dns azure-identity==1.8.0 && \
      pip3 install pyOpenSSL cheroot xmltodict pymongo ansible==6.4.0&& \
-     pip3 install git+https://github.com/grycap/im@$BRANCH && \
+     pip3 install urllib3==1.26.18 git+https://github.com/grycap/im@$BRANCH && \
      apt-get purge -y python3-pip git && \
      apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf ~/.cache/
 

diff --git a/docker-py3/Dockerfile b/docker-py3/Dockerfile
@@ -13,7 +13,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y python3 python3
 RUN apt-get update && apt-get install --no-install-recommends -y python3-setuptools python3-pip git && \
      pip3 install msrest msrestazure azure-common azure-mgmt-storage azure-mgmt-compute azure-mgmt-network azure-mgmt-resource azure-mgmt-dns azure-identity==1.8.0 && \
      pip3 install pyOpenSSL cheroot xmltodict pymongo ansible==6.4.0&& \
-     pip3 install IM==1.15.0 && \
+     pip3 install urllib3==1.26.18 IM==1.15.0 && \
      apt-get purge -y python3-pip git && \
      apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf ~/.cache/