Update pip-tools to support pip>=23.1 (#27901)

* Update pip-tools to support pip>=23.1 Pip 23 changed some internal APIs and removed a deprecated option. This was fixed in pip-tools 6.13.0: https://github.com/jazzband/pip-tools/releases/tag/6.13.0 * Add itsdangerous because it is required by esp32 it seems --------- Co-authored-by: Andrei Litvin <[email protected]>
project-chip · Aug 24, 2023 · 4051814 · 4051814
1 parent 60b5010
commit 4051814
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 81 deletions.
diff --git a/scripts/setup/constraints.txt b/scripts/setup/constraints.txt
@@ -1,17 +1,17 @@
 #
-# This file is autogenerated by pip-compile with Python 3.10
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    pip-compile --output-file=constraints.txt --resolver=backtracking --strip-extras requirements.all.txt
 #
 anytree==2.8.0
-    # via -r requirements.txt
+    # via -r requirements.memory.txt
 appdirs==1.4.4
     # via
-    #   -r requirements.txt
+    #   -r requirements.all.txt
     #   mbed-os-tools
 appnope==0.1.3
-    # via -r requirements.txt
+    # via -r requirements.all.txt
 asttokens==2.2.1
     # via stack-data
 attrs==22.2.0
@@ -28,19 +28,17 @@ bflb-iot-tool==1.8.3
     # via -r requirements.bouffalolab.txt
 bitstring==3.1.9
     # via -r requirements.esp32.txt
-brotli==1.0.9
-    # via flask-compress
 build==0.8.0
     # via
-    #   -r requirements.txt
+    #   -r requirements.all.txt
     #   pip-tools
 cachecontrol==0.12.11
     # via idf-component-manager
 cbor==1.0.0
-    # via -r requirements.txt
+    # via -r requirements.zephyr.txt
 cbor2==5.4.6
     # via
-    #   -r requirements.txt
+    #   -r requirements.zephyr.txt
     #   imgtool
 certifi==2022.12.7
     # via requests
@@ -50,21 +48,20 @@ charset-normalizer==3.0.1
     # via requests
 click==8.1.3
     # via
+    #   -r requirements.build.txt
     #   -r requirements.esp32.txt
-    #   -r requirements.txt
-    #   flask
     #   idf-component-manager
     #   imgtool
     #   mbed-tools
     #   pip-tools
 colorama==0.4.6
     # via
-    #   -r requirements.txt
+    #   -r requirements.all.txt
     #   idf-component-manager
     #   mbed-os-tools
     #   west
 coloredlogs==15.0.1
-    # via -r requirements.txt
+    # via -r requirements.all.txt
 construct==2.10.54
     # via -r requirements.esp32.txt
 contextlib2==21.6.0
@@ -73,14 +70,14 @@ contextlib2==21.6.0
     #   schema
 cryptography==39.0.2
     # via
-    #   -r requirements.txt
+    #   -r requirements.all.txt
     #   imgtool
 cxxfilt==0.3.0
-    # via -r requirements.txt
+    # via -r requirements.memory.txt
 decorator==5.1.1
     # via ipython
 diskcache==5.4.0
-    # via -r requirements.txt
+    # via -r requirements.yaml_tests.txt
 distlib==0.3.6
     # via virtualenv
 docopt==0.6.2
@@ -98,36 +95,21 @@ fasteners==0.18
     # via mbed-os-tools
 filelock==3.9.0
     # via virtualenv
-flask==0.12.5
-    # via
-    #   flask-compress
-    #   flask-socketio
-    #   gdbgui
-flask-compress==1.13
-    # via gdbgui
-flask-socketio==2.9.6
-    # via gdbgui
 future==0.18.3
     # via
     #   -r requirements.esp32.txt
     #   -r requirements.telink.txt
     #   idf-component-manager
     #   mbed-os-tools
     #   pylink-square
-gdbgui==0.13.2.0 ; platform_machine != "aarch64" and sys_platform == "linux"
-    # via -r requirements.esp32.txt
-gevent==1.5.0
-    # via gdbgui
 ghapi==1.0.3
-    # via -r requirements.txt
+    # via -r requirements.memory.txt
 gitdb==4.0.10
     # via gitpython
 gitpython==3.1.31 ; platform_machine != "aarch64" and sys_platform == "linux"
     # via
     #   -r requirements.mbed.txt
     #   mbed-tools
-greenlet==2.0.2
-    # via gevent
 humanfriendly==10.0
     # via coloredlogs
 idf-component-manager==1.2.2
@@ -140,35 +122,31 @@ iniconfig==2.0.0
     # via pytest
 intelhex==2.3.0
     # via
-    #   -r requirements.txt
+    #   -r requirements.zephyr.txt
     #   imgtool
     #   mbed-os-tools
 ipython==8.11.0
-    # via -r requirements.txt
+    # via -r requirements.all.txt
 itsdangerous==2.0.1
-    # via
-    #   -r requirements.esp32.txt
-    #   flask
+    # via -r requirements.esp32.txt
 jedi==0.18.2
     # via ipython
 jinja2==3.0.3
     # via
-    #   -r requirements.esp32.txt
-    #   flask
+    #   -r requirements.build.txt
     #   mbed-tools
 jsonschema==4.17.3
-    # via -r requirements.txt
+    # via -r requirements.zephyr.txt
 junit-xml==1.9
     # via mbed-os-tools
 kconfiglib==13.7.1
     # via -r requirements.esp32.txt
 lark==1.1.5
-    # via -r requirements.txt
+    # via -r requirements.build.txt
 leb128==1.0.5
     # via -r requirements.infineon.txt
 lockfile==0.12.2
     # via
-    #   -r requirements.txt
     #   cachecontrol
     #   mbed-os-tools
 mako==1.2.4
@@ -188,15 +166,15 @@ mbed-os-tools==1.8.15
 mbed-tools==7.59.0 ; platform_machine != "aarch64" and sys_platform == "linux"
     # via -r requirements.mbed.txt
 mobly==1.12.1
-    # via -r requirements.txt
+    # via -r requirements.all.txt
 msgpack==1.0.4
     # via cachecontrol
 mypy==0.971
-    # via -r requirements.txt
+    # via -r requirements.all.txt
 mypy-extensions==1.0.0
     # via mypy
 mypy-protobuf==3.2.0
-    # via -r requirements.txt
+    # via -r requirements.all.txt
 numpy==1.24.2
     # via pandas
 packaging==23.0
@@ -208,7 +186,7 @@ packaging==23.0
     #   pytest
     #   west
 pandas==1.5.3 ; platform_machine != "aarch64" and platform_machine != "arm64"
-    # via -r requirements.txt
+    # via -r requirements.memory.txt
 parso==0.8.3
     # via jedi
 pdoc3==0.10.0 ; platform_machine != "aarch64" and sys_platform == "linux"
@@ -218,11 +196,11 @@ pep517==0.13.0
 pexpect==4.8.0
     # via ipython
 pgi==0.0.11.2 ; sys_platform == "linux"
-    # via -r requirements.txt
+    # via -r requirements.all.txt
 pickleshare==0.7.5
     # via ipython
-pip-tools==6.12.3
-    # via -r requirements.txt
+pip-tools==6.14.0
+    # via -r requirements.all.txt
 platformdirs==3.0.0
     # via virtualenv
 pluggy==1.0.0
@@ -231,7 +209,7 @@ portalocker==2.0.0
     # via bflb-iot-tool
 portpicker==1.5.2
     # via
-    #   -r requirements.txt
+    #   -r requirements.all.txt
     #   mobly
 prettytable==2.5.0
     # via
@@ -241,11 +219,10 @@ prompt-toolkit==3.0.38
     # via ipython
 protobuf==3.20.1
     # via
-    #   -r requirements.txt
+    #   -r requirements.all.txt
     #   mypy-protobuf
 psutil==5.9.4
     # via
-    #   -r requirements.txt
     #   mbed-tools
     #   portpicker
     #   pylink-square
@@ -264,13 +241,9 @@ pycryptodome==3.9.8
     #   bflb-crypto-plus
     #   bflb-iot-tool
 pygdbmi==0.9.0.2
-    # via
-    #   -r requirements.esp32.txt
-    #   gdbgui
+    # via -r requirements.esp32.txt
 pygments==2.14.0
-    # via
-    #   gdbgui
-    #   ipython
+    # via ipython
 pykwalify==1.8.0
     # via west
 pylink-square==0.5.0
@@ -309,9 +282,7 @@ python-dotenv==1.0.0 ; platform_machine != "aarch64" and sys_platform == "linux"
 python-engineio==3.14.2
     # via python-socketio
 python-socketio==4.6.1
-    # via
-    #   -r requirements.esp32.txt
-    #   flask-socketio
+    # via -r requirements.esp32.txt
 pytz==2022.7.1
     # via pandas
 pyudev==0.24.0 ; platform_machine != "aarch64" and sys_platform == "linux"
@@ -327,7 +298,7 @@ reedsolo==1.5.4
     # via -r requirements.esp32.txt
 requests==2.28.2
     # via
-    #   -r requirements.txt
+    #   -r requirements.cirque.txt
     #   cachecontrol
     #   idf-component-manager
     #   mbed-os-tools
@@ -340,8 +311,6 @@ requests-toolbelt==0.10.1
     # via idf-component-manager
 ruamel-yaml==0.17.21
     # via pykwalify
-ruamel-yaml-clib==0.2.7
-    # via ruamel-yaml
 schema==0.7.5
     # via idf-component-manager
 six==1.16.0
@@ -364,20 +333,15 @@ soupsieve==2.4
 stack-data==0.6.2
     # via ipython
 stringcase==1.2.0
-    # via -r requirements.txt
+    # via -r requirements.build.txt
 tabulate==0.9.0
     # via
-    #   -r requirements.txt
+    #   -r requirements.memory.txt
     #   mbed-tools
 toml==0.10.2
     # via pytest
-tomli==2.0.1
-    # via
-    #   build
-    #   mypy
-    #   pep517
 tornado==6.2
-    # via -r requirements.txt
+    # via -r requirements.all.txt
 tqdm==4.64.1
     # via
     #   idf-component-manager
@@ -388,7 +352,7 @@ traitlets==5.9.0
     #   matplotlib-inline
 types-protobuf==3.19.22
     # via
-    #   -r requirements.txt
+    #   -r requirements.all.txt
     #   mypy-protobuf
 typing-extensions==4.5.0 ; platform_machine != "aarch64" and sys_platform == "linux"
     # via
@@ -398,22 +362,20 @@ typing-extensions==4.5.0 ; platform_machine != "aarch64" and sys_platform == "li
 urllib3==1.26.14
     # via requests
 virtualenv==20.20.0
-    # via -r requirements.txt
+    # via -r requirements.all.txt
 watchdog==2.3.1
-    # via -r requirements.txt
+    # via -r requirements.all.txt
 wcwidth==0.2.6
     # via
     #   prettytable
     #   prompt-toolkit
 websockets==10.4
-    # via -r requirements.txt
-werkzeug==0.16.1
-    # via flask
+    # via -r requirements.yaml_tests.txt
 west==1.0.0
-    # via -r requirements.txt
+    # via -r requirements.zephyr.txt
 wheel==0.38.4 ; sys_platform == "linux"
     # via
-    #   -r requirements.txt
+    #   -r requirements.all.txt
     #   pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:

diff --git a/scripts/setup/requirements.all.txt b/scripts/setup/requirements.all.txt
@@ -1,4 +1,4 @@
-pip-tools
+pip-tools>=6.13.0
 virtualenv
 
 # core build requirements

diff --git a/scripts/setup/requirements.esp32.txt b/scripts/setup/requirements.esp32.txt
@@ -9,4 +9,5 @@ ecdsa>=0.16.0
 kconfiglib==13.7.1
 construct==2.10.54
 python-socketio<5
+itsdangerous<2.1 ; python_version < "3.11"
 gdbgui==0.13.2.0 ; python_version < "3.11" and platform_machine != 'aarch64' and sys_platform == 'linux'