Skip to content

Commit

Permalink
[nrf noup] Try to fix conflicting requirements.txt
Browse files Browse the repository at this point in the history
Some github workflows started to fail on the fork due to
conflicting Python requirements. Apply part of the upstream
patch.
  • Loading branch information
Damian-Nordic committed Sep 1, 2021
1 parent b61f444 commit 2d5daa9
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
30 changes: 15 additions & 15 deletions scripts/requirements.esp32.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
setuptools>=21
click>=5.0
pyserial>=3.0
future>=0.15.2
cryptography>=2.1.4
pyparsing>=2.0.3,<2.4.0
pyelftools>=0.22
gdbgui==0.13.2.0 ; platform_machine != 'aarch64'
pygdbmi<=0.9.0.2
reedsolo>=1.5.3,<=1.5.4
bitstring>=3.1.6
ecdsa>=0.16.0
kconfiglib==13.7.1
construct==2.10.54
python-socketio<5
setuptools>=21 ; platform_machine != 'aarch64' and sys_platform == 'linux'
click>=5.0 ; platform_machine != 'aarch64' and sys_platform == 'linux'
pyserial>=3.0 ; platform_machine != 'aarch64' and sys_platform == 'linux'
future>=0.15.2 ; platform_machine != 'aarch64' and sys_platform == 'linux'
cryptography>=2.1.4 ; platform_machine != 'aarch64' and sys_platform == 'linux'
pyparsing>=2.0.3,<2.4.0 ; platform_machine != 'aarch64' and sys_platform == 'linux'
pyelftools>=0.22 ; platform_machine != 'aarch64' and sys_platform == 'linux'
gdbgui==0.13.2.0 ; platform_machine != 'aarch64' and sys_platform == 'linux'
pygdbmi<=0.9.0.2 ; platform_machine != 'aarch64' and sys_platform == 'linux'
reedsolo>=1.5.3,<=1.5.4 ; platform_machine != 'aarch64' and sys_platform == 'linux'
bitstring>=3.1.6 ; platform_machine != 'aarch64' and sys_platform == 'linux'
ecdsa>=0.16.0 ; platform_machine != 'aarch64' and sys_platform == 'linux'
kconfiglib==13.7.1 ; platform_machine != 'aarch64' and sys_platform == 'linux'
construct==2.10.54 ; platform_machine != 'aarch64' and sys_platform == 'linux'
python-socketio<5 ; platform_machine != 'aarch64' and sys_platform == 'linux'
4 changes: 2 additions & 2 deletions scripts/requirements.mbed.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
mbed-tools>=7.0.0
prettytable==0.7.2
mbed-tools>=7.0.0 ; platform_machine != 'aarch64' and sys_platform == 'linux'
prettytable==0.7.2 ; platform_machine != 'aarch64' and sys_platform == 'linux'

0 comments on commit 2d5daa9

Please sign in to comment.