Merge pull request #14780 from Patater/update-python-requirements

Update python requirements

Author: 0xc0170

.travis.yml

@@ -201,7 +201,7 @@ matrix:
       name: "tools-py35"
       env: NAME=tools-py3.5
       language: python
-      python: 3.5
+      python: 3.7
       install:
         # Install gcc
         - source_pkg gcc
@@ -217,8 +217,7 @@ matrix:
           hypothesis>=3,<4
           coverage>=4.5,<5
           "
-        - python -m pip install --upgrade pip==18.1
-        - python -m pip install --upgrade setuptools==40.4.3
+        - pip install --upgrade pip
         - pip install -r requirements.txt
         - pip list --verbose
       script:
@@ -228,16 +227,6 @@ matrix:
         - coverage run -a tools/project.py -S | sed -n '/^Total/p'
         - coverage html
 
-    - <<: *pytools-vm
-      name: "tools-py36"
-      env: NAME=tools-py3.6
-      python: 3.6
-
-    - <<: *pytools-vm
-      name: "tools-py37"
-      env: NAME=tools-py3.7
-      python: 3.7
-
     - &extended-vm
       stage: "Pin validation"
       name: "pinvalidate"
@@ -246,8 +235,7 @@ matrix:
       python: 3.7
       install:
         # Install python modules
-        - python -m pip install --upgrade pip==18.1
-        - python -m pip install --upgrade setuptools==40.4.3
+        - pip install --upgrade pip
         - pip install tabulate argparse
         - pip list --verbose
         # Fetch the base branch to compare against
@@ -302,8 +290,8 @@ matrix:
     - &cmake-build-run-unittest
       stage: "CMake"
       name: "CMake unittest build"
-      env: NAME=cmake_unittest 
-      install:        
+      env: NAME=cmake_unittest
+      install:
         # Hide Travis-preinstalled CMake
         # The Travis-preinstalled CMake is unfortunately not installed via apt, so we
         # can't replace it with an apt-supplied version very easily. Additionally, we

requirements.txt

@@ -1,16 +1,16 @@
 colorama==0.3.9
-urllib3[secure]==1.24.2
+urllib3[secure]>=1.26.5
 prettytable==0.7.2
 junit-xml==1.8
-pyyaml==4.2b1
+PyYAML>=5.4
 jsonschema==2.6.0
 future>=0.18.0,<1.0
 six==1.12.0
 mbed-cloud-sdk>=2.0.6,<2.1
-requests>=2.20,<2.21
+requests>=2.20,<3
 idna>=2,<2.8
 pyserial>=3,<=3.4
-Jinja2>=2.10.1,<2.11
+jinja2>=2.11.3
 intelhex>=2.3.0,<3.0.0
 mbed-ls>=1.5.1,<2.0
 mbed-host-tests>=1.4.4,<2.0
@@ -26,6 +26,6 @@ cmsis-pack-manager>=0.2.3,<0.3.0
 pywin32==224;platform_system=='Windows'
 wmi==1.4.9;platform_system=='Windows'
 psutil==5.6.6
-cryptography>=2.5,<3
+cryptography>=3.2,<4
 Click>=7.0,<8
 cbor>=1.0.0

tools/cmake/requirements.txt

@@ -1,4 +1,4 @@
 prettytable==0.7.2
-future==0.16.0
-Jinja2>=2.10.1,<2.11
+future>=0.18.0,<1.0
+jinja2>=2.11.3
 intelhex>=2.3.0,<3.0.0