Skip to content

Commit

Permalink
Fix mac to use [email protected] (#367)
Browse files Browse the repository at this point in the history 
homebrew introduced [email protected] and broke our current uses of 3.12.
  • Loading branch information
@RussTedrake
RussTedrake authored Oct 11, 2024
1 parent f4277d6 commit fa69216
Show file tree
Hide file tree
Showing 10 changed files with 605 additions and 582 deletions.
2 changes: 1 addition & 1 deletion .bazelrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ build --test_summary=terse

build:linux --action_env=PATH=/usr/sbin:/usr/bin:/sbin:/bin

build:macos --action_env=PATH=/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin
build:macos --action_env=PATH=/opt/homebrew/opt/[email protected]/bin:/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin
build:macos --test_timeout=120,600,1800,7200

# Disable python imports from ~/.local (pip -U) during build and test.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
- name: black
uses: psf/black@stable
with:
version: 24.8.0
version: 24.10.0
jupyter: true
- name: isort
uses: isort/isort-action@master
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/psf/black
rev: 24.8.0 # NOTE: If updating, also update the version in .github/workflows/*
rev: 24.10.0 # NOTE: If updating, also update the version in .github/workflows/*
hooks:
- id: black-jupyter
types_or: ["python","jupyter"]
Expand Down
2 changes: 1 addition & 1 deletion book/htmlbook
Submodule htmlbook updated 1 files
+42 −25 workflows/ci/sonoma/setup
945 changes: 484 additions & 461 deletions poetry.lock
View file

Large diffs are not rendered by default.

58 changes: 29 additions & 29 deletions requirements-bazel-linux.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ attrs==24.2.0 ; python_version >= "3.10" and python_version < "4.0" and (sys_pla
autoprop==4.1.0 ; python_version >= "3.10" and python_version < "4.0"
bayesian-optimization==1.5.1 ; python_version >= "3.10" and python_version < "4.0"
beautifulsoup4==4.12.3 ; python_version >= "3.10" and python_version < "4.0"
black[jupyter]==24.8.0 ; python_version >= "3.10" and python_version < "4.0"
black[jupyter]==24.10.0 ; python_version >= "3.10" and python_version < "4.0"
bleach==6.1.0 ; python_version >= "3.10" and python_version < "4.0" and (sys_platform == "darwin" or sys_platform == "linux")
build==1.2.2 ; python_version >= "3.10" and python_version < "4.0"
build==1.2.2.post1 ; python_version >= "3.10" and python_version < "4.0"
cachecontrol[filecache]==0.14.0 ; python_version >= "3.10" and python_version < "4.0"
certifi==2024.8.30 ; python_version >= "3.10" and python_version < "4.0"
cffi==1.17.1 ; python_version >= "3.10" and python_version < "4.0" and (sys_platform == "darwin" or sys_platform == "linux") and (implementation_name == "pypy" or sys_platform == "darwin" or platform_python_implementation != "PyPy")
cfgv==3.4.0 ; python_version >= "3.10" and python_version < "4.0"
charset-normalizer==3.3.2 ; python_version >= "3.10" and python_version < "4.0"
charset-normalizer==3.4.0 ; python_version >= "3.10" and python_version < "4.0"
cleo==2.1.0 ; python_version >= "3.10" and python_version < "4.0"
click==8.1.7 ; python_version >= "3.10" and python_version < "4.0"
cloudpickle==2.2.1 ; python_version >= "3.10" and python_version < "4.0"
Expand All @@ -24,47 +24,47 @@ cycler==0.12.1 ; python_version >= "3.10" and python_version < "4.0"
cython==3.0.11 ; python_version >= "3.10" and python_version < "4.0"
decorator==5.1.1 ; python_version >= "3.10" and python_version < "4.0"
defusedxml==0.7.1 ; python_version >= "3.10" and python_version < "4.0" and (sys_platform == "darwin" or sys_platform == "linux")
distlib==0.3.8 ; python_version >= "3.10" and python_version < "4.0"
drake==1.32.0 ; python_version >= "3.10" and python_version < "4.0"
distlib==0.3.9 ; python_version >= "3.10" and python_version < "4.0"
drake==1.33.0 ; python_version >= "3.10" and python_version < "4.0"
dulwich==0.21.7 ; python_version >= "3.10" and python_version < "4.0"
entrypoints==0.4 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "linux"
exceptiongroup==1.2.2 ; python_version >= "3.10" and python_version < "3.11"
executing==2.1.0 ; python_version >= "3.10" and python_version < "4.0"
farama-notifications==0.0.4 ; python_version >= "3.10" and python_version < "4.0"
fastjsonschema==2.20.0 ; python_version >= "3.10" and python_version < "4.0"
filelock==3.16.0 ; python_version >= "3.10" and python_version < "4.0"
fonttools==4.53.1 ; python_version >= "3.10" and python_version < "4.0"
filelock==3.16.1 ; python_version >= "3.10" and python_version < "4.0"
fonttools==4.54.1 ; python_version >= "3.10" and python_version < "4.0"
fsspec==2024.9.0 ; python_version >= "3.10" and python_version < "4.0"
glooey==0.3.6 ; python_version >= "3.10" and python_version < "4.0"
gradescope-utils==0.5.0 ; python_version >= "3.10" and python_version < "4.0"
gymnasium==0.29.1 ; python_version >= "3.10" and python_version < "4.0"
identify==2.6.0 ; python_version >= "3.10" and python_version < "4.0"
idna==3.8 ; python_version >= "3.10" and python_version < "4.0"
identify==2.6.1 ; python_version >= "3.10" and python_version < "4.0"
idna==3.10 ; python_version >= "3.10" and python_version < "4.0"
imageio==2.35.1 ; python_version >= "3.10" and python_version < "4.0"
importlib-metadata==8.5.0 ; python_version >= "3.10" and python_version < "3.12"
installer==0.7.0 ; python_version >= "3.10" and python_version < "4.0"
intel-openmp==2021.4.0 ; python_version >= "3.10" and python_version < "4.0" and platform_system == "Windows"
ipython==8.27.0 ; python_version >= "3.10" and python_version < "4.0"
ipython==8.28.0 ; python_version >= "3.10" and python_version < "4.0"
ipywidgets==8.1.5 ; python_version >= "3.10" and python_version < "4.0"
jaraco-classes==3.4.0 ; python_version >= "3.10" and python_version < "4.0"
jedi==0.19.1 ; python_version >= "3.10" and python_version < "4.0"
jeepney==0.8.0 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "linux"
jinja2==3.1.4 ; python_version >= "3.10" and python_version < "4.0"
joblib==1.4.2 ; python_version >= "3.10" and python_version < "4.0"
jsonschema-specifications==2023.12.1 ; python_version >= "3.10" and python_version < "4.0" and (sys_platform == "darwin" or sys_platform == "linux")
jsonschema-specifications==2024.10.1 ; python_version >= "3.10" and python_version < "4.0" and (sys_platform == "darwin" or sys_platform == "linux")
jsonschema==4.23.0 ; python_version >= "3.10" and python_version < "4.0" and (sys_platform == "darwin" or sys_platform == "linux")
jupyter-client==8.6.2 ; python_version >= "3.10" and python_version < "4.0" and (sys_platform == "darwin" or sys_platform == "linux")
jupyter-client==8.6.3 ; python_version >= "3.10" and python_version < "4.0" and (sys_platform == "darwin" or sys_platform == "linux")
jupyter-core==5.7.2 ; python_version >= "3.10" and python_version < "4.0" and (sys_platform == "darwin" or sys_platform == "linux")
jupyterlab-pygments==0.3.0 ; python_version >= "3.10" and python_version < "4.0" and (sys_platform == "darwin" or sys_platform == "linux")
jupyterlab-widgets==3.0.13 ; python_version >= "3.10" and python_version < "4.0"
keyring==24.3.1 ; python_version >= "3.10" and python_version < "4.0"
kiwisolver==1.4.7 ; python_version >= "3.10" and python_version < "4.0"
lazy-loader==0.4 ; python_version >= "3.10" and python_version < "4.0"
lxml-html-clean==0.2.2 ; python_version >= "3.10" and python_version < "4.0"
lxml-html-clean==0.3.1 ; python_version >= "3.10" and python_version < "4.0"
lxml==5.3.0 ; python_version >= "3.10" and python_version < "4.0"
manifold3d==2.5.1 ; python_version >= "3.10" and python_version < "4.0"
markdown-it-py==3.0.0 ; python_version >= "3.10" and python_version < "4.0"
markupsafe==2.1.5 ; python_version >= "3.10" and python_version < "4.0"
markupsafe==3.0.1 ; python_version >= "3.10" and python_version < "4.0"
matplotlib-inline==0.1.7 ; python_version >= "3.10" and python_version < "4.0"
matplotlib==3.5.1 ; sys_platform == "linux"
mdurl==0.1.2 ; python_version >= "3.10" and python_version < "4.0"
Expand Down Expand Up @@ -95,40 +95,40 @@ nvidia-curand-cu12==10.3.2.106 ; platform_system == "Linux" and platform_machine
nvidia-cusolver-cu12==11.4.5.107 ; platform_system == "Linux" and platform_machine == "x86_64" and python_version >= "3.10" and python_version < "4.0"
nvidia-cusparse-cu12==12.1.0.106 ; platform_system == "Linux" and platform_machine == "x86_64" and python_version >= "3.10" and python_version < "4.0"
nvidia-nccl-cu12==2.20.5 ; platform_system == "Linux" and platform_machine == "x86_64" and python_version >= "3.10" and python_version < "4.0"
nvidia-nvjitlink-cu12==12.6.68 ; platform_system == "Linux" and platform_machine == "x86_64" and python_version >= "3.10" and python_version < "4.0"
nvidia-nvjitlink-cu12==12.6.77 ; platform_system == "Linux" and platform_machine == "x86_64" and python_version >= "3.10" and python_version < "4.0"
nvidia-nvtx-cu12==12.1.105 ; platform_system == "Linux" and platform_machine == "x86_64" and python_version >= "3.10" and python_version < "4.0"
packaging==24.1 ; python_version >= "3.10" and python_version < "4.0"
pandas==2.2.2 ; python_version >= "3.10" and python_version < "4.0"
pandas==2.2.3 ; python_version >= "3.10" and python_version < "4.0"
pandocfilters==1.5.1 ; python_version >= "3.10" and python_version < "4.0" and (sys_platform == "darwin" or sys_platform == "linux")
parso==0.8.4 ; python_version >= "3.10" and python_version < "4.0"
pathspec==0.12.1 ; python_version >= "3.10" and python_version < "4.0"
pexpect==4.9.0 ; python_version >= "3.10" and python_version < "4.0"
pillow==10.4.0 ; python_version >= "3.10" and python_version < "4.0"
pkginfo==1.11.1 ; python_version >= "3.10" and python_version < "4.0"
platformdirs==4.3.2 ; python_version >= "3.10" and python_version < "4.0"
platformdirs==4.3.6 ; python_version >= "3.10" and python_version < "4.0"
pre-commit==3.8.0 ; python_version >= "3.10" and python_version < "4.0"
prompt-toolkit==3.0.47 ; python_version >= "3.10" and python_version < "4.0"
prompt-toolkit==3.0.48 ; python_version >= "3.10" and python_version < "4.0"
psutil==6.0.0 ; python_version >= "3.10" and python_version < "4.0"
ptyprocess==0.7.0 ; python_version >= "3.10" and python_version < "4.0"
pure-eval==0.2.3 ; python_version >= "3.10" and python_version < "4.0"
py==1.11.0 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "linux" and implementation_name == "pypy"
pycparser==2.22 ; python_version >= "3.10" and python_version < "4.0" and (sys_platform == "darwin" or sys_platform == "linux") and (implementation_name == "pypy" or sys_platform == "darwin" or platform_python_implementation != "PyPy")
pydot==3.0.1 ; python_version >= "3.10" and python_version < "4.0"
pydot==3.0.2 ; python_version >= "3.10" and python_version < "4.0"
pyglet==1.5.29 ; python_version >= "3.10" and python_version < "4.0"
pygments==2.18.0 ; python_version >= "3.10" and python_version < "4.0"
pyparsing==3.1.4 ; python_version >= "3.10" and python_version < "4.0"
pyproject-hooks==1.1.0 ; python_version >= "3.10" and python_version < "4.0"
pyproject-hooks==1.2.0 ; python_version >= "3.10" and python_version < "4.0"
python-dateutil==2.9.0.post0 ; python_version >= "3.10" and python_version < "4.0"
python-fcl==0.7.0.6 ; python_version >= "3.10" and python_version < "4.0"
pytz==2024.2 ; python_version >= "3.10" and python_version < "4.0"
pyvirtualdisplay==3.0 ; python_version >= "3.10" and python_version < "4.0"
pyyaml==6.0.2 ; python_version >= "3.10" and python_version < "4.0"
pyzmq==24.0.1 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "linux"
rapidfuzz==3.9.7 ; python_version >= "3.10" and python_version < "4.0"
rapidfuzz==3.10.0 ; python_version >= "3.10" and python_version < "4.0"
referencing==0.35.1 ; python_version >= "3.10" and python_version < "4.0" and (sys_platform == "darwin" or sys_platform == "linux")
requests-toolbelt==1.0.0 ; python_version >= "3.10" and python_version < "4.0"
requests==2.32.3 ; python_version >= "3.10" and python_version < "4.0"
rich==13.8.1 ; python_version >= "3.10" and python_version < "4.0"
rich==13.9.2 ; python_version >= "3.10" and python_version < "4.0"
rpds-py==0.20.0 ; python_version >= "3.10" and python_version < "4.0" and (sys_platform == "darwin" or sys_platform == "linux")
scikit-image==0.24.0 ; python_version >= "3.10" and python_version < "4.0"
scikit-learn==1.5.2 ; python_version >= "3.10" and python_version < "4.0"
Expand All @@ -140,14 +140,14 @@ six==1.16.0 ; python_version >= "3.10" and python_version < "4.0"
soupsieve==2.6 ; python_version >= "3.10" and python_version < "4.0"
stable-baselines3==2.3.2 ; python_version >= "3.10" and python_version < "4.0"
stack-data==0.6.3 ; python_version >= "3.10" and python_version < "4.0"
sympy==1.13.2 ; python_version >= "3.10" and python_version < "4.0"
sympy==1.13.3 ; python_version >= "3.10" and python_version < "4.0"
tbb==2021.13.1 ; python_version >= "3.10" and python_version < "4.0" and platform_system == "Windows"
testpath==0.6.0 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "linux"
threadpoolctl==3.5.0 ; python_version >= "3.10" and python_version < "4.0"
tifffile==2024.8.30 ; python_version >= "3.10" and python_version < "4.0"
tifffile==2024.9.20 ; python_version >= "3.10" and python_version < "4.0"
timeout-decorator==0.5.0 ; python_version >= "3.10" and python_version < "4.0"
tokenize-rt==6.0.0 ; python_version >= "3.10" and python_version < "4.0"
tomli==2.0.1 ; python_version >= "3.10" and python_version < "3.11"
tomli==2.0.2 ; python_version >= "3.10" and python_version < "3.11"
tomlkit==0.13.2 ; python_version >= "3.10" and python_version < "4.0"
--find-links https://download.pytorch.org/whl/torch_stable.html
torch==2.3.1+cpu ; python_version >= "3.10" and sys_platform == "linux"
Expand All @@ -157,15 +157,15 @@ tqdm==4.66.5 ; python_version >= "3.10" and python_version < "4.0"
traitlets==5.14.3 ; python_version >= "3.10" and python_version < "4.0"
trimesh[recommend]==4.1.8 ; python_version >= "3.10" and python_version < "4.0"
triton==2.3.1 ; platform_system == "Linux" and platform_machine == "x86_64" and python_version < "3.12" and python_version >= "3.10"
trove-classifiers==2024.7.2 ; python_version >= "3.10" and python_version < "4.0"
trove-classifiers==2024.9.12 ; python_version >= "3.10" and python_version < "4.0"
typeguard==3.0.2 ; python_version >= "3.10" and python_version < "4.0"
typing-extensions==4.12.2 ; python_version >= "3.10" and python_version < "4.0"
tzdata==2024.1 ; python_version >= "3.10" and python_version < "4.0"
tzdata==2024.2 ; python_version >= "3.10" and python_version < "4.0"
urllib3==2.2.3 ; python_version >= "3.10" and python_version < "4.0"
vecrec==0.3.1 ; python_version >= "3.10" and python_version < "4.0"
vhacdx==0.0.8.post1 ; python_version >= "3.10" and python_version < "4.0"
virtualenv==20.26.4 ; python_version >= "3.10" and python_version < "4.0"
virtualenv==20.26.6 ; python_version >= "3.10" and python_version < "4.0"
wcwidth==0.2.13 ; python_version >= "3.10" and python_version < "4.0"
webencodings==0.5.1 ; python_version >= "3.10" and python_version < "4.0" and (sys_platform == "darwin" or sys_platform == "linux")
widgetsnbextension==4.0.13 ; python_version >= "3.10" and python_version < "4.0"
zipp==3.20.1 ; python_version >= "3.10" and python_version < "3.12"
zipp==3.20.2 ; python_version >= "3.10" and python_version < "3.12"
Loading

0 comments on commit fa69216

Please sign in to comment.