Skip to content

Commit

Permalink
Revert "regenerate constraints.txt using pip-compile (project-chip#9271
Browse files Browse the repository at this point in the history
…)", more changes to reduce darwin dependencies (project-chip#9296)

* Revert "regenerate constraints.txt using pip-compile (project-chip#9271)"

This reverts commit 1b3714e.

* Do not add esp32 or mbed to darwin requirements

* Use "and" to separate conditions for installation markers

* Move environment markers (https://www.python.org/dev/peps/pep-0345/#environment-markers) into recursively-included files themselves
  • Loading branch information
andy31415 authored and mkardous-silabs committed Sep 24, 2021
1 parent d058ee9 commit 750e053
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 80 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/examples-mbed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@
name: Build example - Mbed OS

on:
# TODO: automated builds disabled due to pdoc3/mbed-tools conflict
# push:
# pull_request:
push:
pull_request:
workflow_dispatch:

concurrency:
Expand Down
113 changes: 55 additions & 58 deletions scripts/constraints.txt
Original file line number Diff line number Diff line change
@@ -1,45 +1,44 @@
#
# This file is autogenerated by pip-compile with python 3.8
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --output-file=constraints.txt requirements.txt
#
anytree==2.8.0
# via -r requirements.txt
appdirs==1.4.4
# via -r requirements.txt
# via
# -r requirements.txt
# virtualenv
appnope==0.1.2
# via -r requirements.txt
backcall==0.2.0
# via ipython
backports.entry-points-selectable==1.1.0
# via virtualenv
bitstring==3.1.9
bidict==0.21.2
# via python-socketio
bitstring==3.1.7
# via -r requirements.esp32.txt
brotli==1.0.9
# via flask-compress
certifi==2021.5.30
# via requests
cffi==1.14.6
cffi==1.14.5
# via cryptography
charset-normalizer==2.0.4
chardet==4.0.0
# via requests
click==7.1.2
# via
# -r requirements.esp32.txt
# -r requirements.txt
# flask
# mbed-tools
# pip-tools
colorama==0.4.4
# via west
coloredlogs==15.0.1
# via -r requirements.txt
construct==2.10.54
# via -r requirements.esp32.txt
cryptography==3.4.8
cryptography==3.4.7
# via -r requirements.esp32.txt
cxxfilt==0.3.0
cxxfilt==0.2.2
# via -r requirements.txt
dbus-python==1.2.16 ; sys_platform == "linux"
# via -r requirements.txt
Expand All @@ -53,37 +52,39 @@ ecdsa==0.17.0
# via -r requirements.esp32.txt
filelock==3.0.12
# via virtualenv
flask-compress==1.10.0
# via gdbgui
flask-socketio==2.9.6
# via gdbgui
flask==0.12.5
# via
# flask-compress
# flask-socketio
# gdbgui
flask-compress==1.10.1
# via gdbgui
flask-socketio==2.9.6
# via gdbgui
future==0.18.2
# via -r requirements.esp32.txt
# via
# -r requirements.esp32.txt
# mobly
gdbgui==0.13.2.0 ; platform_machine != "aarch64"
# via -r requirements.esp32.txt
gevent==1.5.0
# via gdbgui
gitdb==4.0.7
# via gitpython
gitpython==3.1.18
gitpython==3.1.14
# via mbed-tools
greenlet==1.1.1
greenlet==1.1.0
# via gevent
humanfriendly==9.2
# via coloredlogs
idna==3.2
idna==2.10
# via requests
intelhex==2.3.0
# via -r requirements.txt
ipython==7.26.0
# via -r requirements.txt
ipython-genutils==0.2.0
# via traitlets
ipython==7.24.1
# via -r requirements.txt
itsdangerous==2.0.1
# via flask
jedi==0.18.0
Expand All @@ -92,47 +93,49 @@ jinja2==3.0.1
# via
# flask
# mbed-tools
kconfiglib==13.7.1
# via -r requirements.esp32.txt
lockfile==0.12.2
# via -r requirements.txt
mako==1.1.4
# via pdoc3
markdown==3.3.4
# via pdoc3
markupsafe==2.0.1
# via
# jinja2
# mako
matplotlib-inline==0.1.2
# via ipython
mbed-tools==7.31.1
mbed-tools==7.22.0
# via -r requirements.mbed.txt
mobly==1.11
mobly==1.10.1
# via -r requirements.txt
numpy==1.21.2
numpy==1.20.3
# via pandas
packaging==21.0
packaging==20.9
# via west
pandas==1.3.2 ; platform_machine != "aarch64"
pandas==1.2.4 ; platform_machine != "aarch64"
# via -r requirements.txt
parso==0.8.2
# via jedi
pep517==0.11.0
pdoc3==0.9.2
# via mbed-tools
pep517==0.10.0
# via pip-tools
pexpect==4.8.0
# via ipython
pgi==0.0.11.2 ; sys_platform == "linux"
# via -r requirements.txt
pickleshare==0.7.5
# via ipython
pip-tools==6.2.0
pip-tools==6.1.0
# via -r requirements.txt
platformdirs==2.2.0
# via virtualenv
portpicker==1.4.0
# via
# -r requirements.txt
# mobly
prettytable==0.7.2
# via -r requirements.mbed.txt
prompt-toolkit==3.0.20
prompt-toolkit==3.0.18
# via ipython
protobuf==3.17.3
# via -r requirements.txt
Expand All @@ -151,7 +154,7 @@ pygdbmi==0.9.0.2
# via
# -r requirements.esp32.txt
# gdbgui
pygments==2.10.0
pygments==2.9.0
# via
# gdbgui
# ipython
Expand All @@ -166,18 +169,16 @@ pyserial==3.5
# -r requirements.esp32.txt
# mbed-tools
# mobly
python-dateutil==2.8.2
python-dateutil==2.8.1
# via
# pandas
# pykwalify
python-dotenv==0.19.0
python-dotenv==0.17.1
# via mbed-tools
python-engineio==3.14.2
python-engineio==4.2.0
# via python-socketio
python-socketio==4.6.1
# via
# -r requirements.esp32.txt
# flask-socketio
python-socketio<5
# via flask-socketio
pytz==2021.1
# via pandas
pyudev==0.22.0
Expand All @@ -188,22 +189,20 @@ pyyaml==5.4.1
# west
reedsolo==1.5.4
# via -r requirements.esp32.txt
requests==2.26.0
requests==2.25.1
# via
# -r requirements.txt
# mbed-tools
ruamel.yaml==0.17.14
# via pykwalify
ruamel.yaml.clib==0.2.6
ruamel.yaml.clib==0.2.2
# via ruamel.yaml
ruamel.yaml==0.17.9
# via pykwalify
six==1.16.0
# via
# anytree
# ecdsa
# protobuf
# python-dateutil
# python-engineio
# python-socketio
# pyudev
# virtualenv
smmap==4.0.0
Expand All @@ -212,32 +211,30 @@ tabulate==0.8.9
# via mbed-tools
timeout-decorator==0.5.0
# via mobly
tomli==1.2.1
toml==0.10.2
# via pep517
tqdm==4.62.2
tqdm==4.61.1
# via mbed-tools
traitlets==5.0.5
# via
# ipython
# matplotlib-inline
typing-extensions==3.10.0.0
# via mbed-tools
urllib3==1.26.6
urllib3==1.26.5
# via requests
virtualenv==20.7.2
virtualenv==20.4.7
# via -r requirements.txt
watchdog==2.1.5
watchdog==2.1.2
# via -r requirements.txt
wcwidth==0.2.5
# via prompt-toolkit
werkzeug==0.16.1
# via flask
west==0.11.1
west==0.11.0
# via -r requirements.txt
wheel==0.36.2
# via -r requirements.txt
wheel==0.37.0
# via
# -r requirements.txt
# pip-tools

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
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'
4 changes: 2 additions & 2 deletions scripts/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ pip-tools
virtualenv

# esp-idf
-r requirements.esp32.txt ; platform_machine != 'aarch64'
-r requirements.esp32.txt

# mbed-os
-r requirements.mbed.txt ; platform_machine != 'aarch64'
-r requirements.mbed.txt

# cirque tests
requests>=2.24.0
Expand Down

0 comments on commit 750e053

Please sign in to comment.