recommend [email protected] on mac

RussTedrake · Oct 11, 2024 · 308cc7a · 308cc7a
1 parent 5438f52
commit 308cc7a
Show file tree

Hide file tree

Showing 10 changed files with 691 additions and 668 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -41,39 +41,39 @@ on:
   schedule:
     - cron: '0 8 * * *'
 jobs:
-  jammy:
-    name: ubuntu 22.04 jammy
-    runs-on: ubuntu-22.04
-    container: ubuntu:22.04
-    steps:
-      - name: pre-checkout setup
-        run: |
-          export APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 DEBIAN_FRONTEND=noninteractive
-          apt-get update -o APT::Acquire::Retries=4 -qq
-          apt-get install -o APT::Acquire::Retries=4 -o Dpkg::Use-Pty=0 -qy --no-install-recommends ca-certificates gnupg
-          apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E1DD270288B4E6030699E45FA1715D88E1DF1F24
-          echo 'deb http://ppa.launchpad.net/git-core/ppa/ubuntu focal main' > /etc/apt/sources.list.d/git.list
-          apt-get update -o APT::Acquire::Retries=4 -qq
-          apt-get install -o APT::Acquire::Retries=4 -o Dpkg::Use-Pty=0 -qy --no-install-recommends git
-          rm -rf /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin /var/lib/apt/lists/* /var/log/apt/*
-        shell: bash
-      - name: checkout
-        uses: actions/checkout@v2
-      - name: submodule checkout
-        run:  ./setup/submodule_checkout
-        shell: bash
-      - name: post-checkout setup
-        run: ./book/htmlbook/workflows/ci/jammy/setup
-        shell: bash
-#      - name: Check disk space
-#        run: |
-#          dpkg-query -Wf '${Installed-Size}\t${Package}\n' | sort -nr | head
-#          df . -h
-#          du /usr/ -hx -d 4 --threshold=1G | sort -hr | head
-#        shell: bash
-      - name: test
-        run: ./book/htmlbook/workflows/ci/jammy/test
-        shell: bash
+#   jammy:
+#     name: ubuntu 22.04 jammy
+#     runs-on: ubuntu-22.04
+#     container: ubuntu:22.04
+#     steps:
+#       - name: pre-checkout setup
+#         run: |
+#           export APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 DEBIAN_FRONTEND=noninteractive
+#           apt-get update -o APT::Acquire::Retries=4 -qq
+#           apt-get install -o APT::Acquire::Retries=4 -o Dpkg::Use-Pty=0 -qy --no-install-recommends ca-certificates gnupg
+#           apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E1DD270288B4E6030699E45FA1715D88E1DF1F24
+#           echo 'deb http://ppa.launchpad.net/git-core/ppa/ubuntu focal main' > /etc/apt/sources.list.d/git.list
+#           apt-get update -o APT::Acquire::Retries=4 -qq
+#           apt-get install -o APT::Acquire::Retries=4 -o Dpkg::Use-Pty=0 -qy --no-install-recommends git
+#           rm -rf /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin /var/lib/apt/lists/* /var/log/apt/*
+#         shell: bash
+#       - name: checkout
+#         uses: actions/checkout@v2
+#       - name: submodule checkout
+#         run:  ./setup/submodule_checkout
+#         shell: bash
+#       - name: post-checkout setup
+#         run: ./book/htmlbook/workflows/ci/jammy/setup
+#         shell: bash
+# #      - name: Check disk space
+# #        run: |
+# #          dpkg-query -Wf '${Installed-Size}\t${Package}\n' | sort -nr | head
+# #          df . -h
+# #          du /usr/ -hx -d 4 --threshold=1G | sort -hr | head
+# #        shell: bash
+#       - name: test
+#         run: ./book/htmlbook/workflows/ci/jammy/test
+#         shell: bash
 
   sonoma:
     name: macos sonoma 14
@@ -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

diff --git a/.github/workflows/noncritical.yml b/.github/workflows/noncritical.yml
@@ -41,58 +41,58 @@ on:
   schedule:
     - cron: '0 8 * * *'
 jobs:
-  docker:
-    name: dockerfile
-    runs-on: ubuntu-latest
-    container: russtedrake/manipulation:latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v2
-      - name: submodule checkout
-        run:  ./setup/submodule_checkout
-        shell: bash
-      - name: post-checkout setup
-        # Force bazel to use user pip instead of re-downloading everything to 
-        # be hermetic:
-        run: |
-          truncate -s0 requirements.txt 
-          sed -i '/PYTHONNOUSERSITE/d' .bazelrc
-        shell: bash
-      - name: test
-        run: ./book/htmlbook/workflows/ci/jammy/test
-        shell: bash
-  jammy-pip:
-    # This should emulate a student's experience if they are doing the psets
-    # via pip install manipulation.
-    #
-    # TODO(russt): Revisit the pip3 install -r requirements.txt below. Maybe I
-    # need to separate out testing requirements from notebook requirements.
-    name: pip on jammy
-    runs-on: ubuntu-22.04
-    container: ubuntu:22.04
-    steps:
-      - name: pre-checkout setup
-        run: |
-          apt-get update -o APT::Acquire::Retries=4 -qq
-          apt-get install -o APT::Acquire::Retries=4 -o Dpkg::Use-Pty=0 -qy --no-install-recommends python3-pip git xvfb
-          pip3 install manipulation --extra-index-url https://drake-packages.csail.mit.edu/whl/nightly/
-        shell: bash
-      - name: checkout
-        uses: actions/checkout@v2
-      - name: submodule checkout
-        run:  ./setup/submodule_checkout
-        shell: bash
-      - name: post-checkout setup
-        # Force bazel to use user pip instead of re-downloading everything to
-        # be hermetic. Also apply patches to avoid bazel dependency on
-        # installed drake.
-        run: |
-          ./setup/ubuntu/22.04/install_prereqs.sh
-          pip3 install -r requirements.txt  # poetry does not publish dependency groups https://github.com/python-poetry/poetry/issues/6727
-          truncate -s0 requirements.txt
-          sed -i '/PYTHONNOUSERSITE/d' .bazelrc
-        shell: bash
-      - name: test
-        run: DRAKE_RESOURCE_ROOT=`python3 -c "from pathlib import Path; from pydrake.all import GetDrakePath; print(Path(GetDrakePath()).parent)"` ./book/htmlbook/workflows/ci/jammy/test_w_installed_deps
-        shell: bash
+  # docker:
+  #   name: dockerfile
+  #   runs-on: ubuntu-latest
+  #   container: russtedrake/manipulation:latest
+  #   steps:
+  #     - name: checkout
+  #       uses: actions/checkout@v2
+  #     - name: submodule checkout
+  #       run:  ./setup/submodule_checkout
+  #       shell: bash
+  #     - name: post-checkout setup
+  #       # Force bazel to use user pip instead of re-downloading everything to 
+  #       # be hermetic:
+  #       run: |
+  #         truncate -s0 requirements.txt 
+  #         sed -i '/PYTHONNOUSERSITE/d' .bazelrc
+  #       shell: bash
+  #     - name: test
+  #       run: ./book/htmlbook/workflows/ci/jammy/test
+  #       shell: bash
+  # jammy-pip:
+  #   # This should emulate a student's experience if they are doing the psets
+  #   # via pip install manipulation.
+  #   #
+  #   # TODO(russt): Revisit the pip3 install -r requirements.txt below. Maybe I
+  #   # need to separate out testing requirements from notebook requirements.
+  #   name: pip on jammy
+  #   runs-on: ubuntu-22.04
+  #   container: ubuntu:22.04
+  #   steps:
+  #     - name: pre-checkout setup
+  #       run: |
+  #         apt-get update -o APT::Acquire::Retries=4 -qq
+  #         apt-get install -o APT::Acquire::Retries=4 -o Dpkg::Use-Pty=0 -qy --no-install-recommends python3-pip git xvfb
+  #         pip3 install manipulation --extra-index-url https://drake-packages.csail.mit.edu/whl/nightly/
+  #       shell: bash
+  #     - name: checkout
+  #       uses: actions/checkout@v2
+  #     - name: submodule checkout
+  #       run:  ./setup/submodule_checkout
+  #       shell: bash
+  #     - name: post-checkout setup
+  #       # Force bazel to use user pip instead of re-downloading everything to
+  #       # be hermetic. Also apply patches to avoid bazel dependency on
+  #       # installed drake.
+  #       run: |
+  #         ./setup/ubuntu/22.04/install_prereqs.sh
+  #         pip3 install -r requirements.txt  # poetry does not publish dependency groups https://github.com/python-poetry/poetry/issues/6727
+  #         truncate -s0 requirements.txt
+  #         sed -i '/PYTHONNOUSERSITE/d' .bazelrc
+  #       shell: bash
+  #     - name: test
+  #       run: DRAKE_RESOURCE_ROOT=`python3 -c "from pathlib import Path; from pydrake.all import GetDrakePath; print(Path(GetDrakePath()).parent)"` ./book/htmlbook/workflows/ci/jammy/test_w_installed_deps
+  #       shell: bash
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -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"] 

diff --git a/book/htmlbook b/book/htmlbook