Auto merge of servo#28960 - servo:jdm-patch-30, r=jdm

Upgrade setuptools.

Attempting to fix a new build error in CI.

Author: bors-servo

.github/workflows/main.yml

@@ -104,6 +104,15 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 2
+      # TODO: Remove this step when the compatibility issue between mozjs and
+      #       Homebrew's Python 3.10 formula (servo/rust-mozjs#559) is fixed
+      - name: Select Python 3.9
+        run: |
+          brew install python@3.9
+          cd $(dirname $(which python3.9))
+          rm -f python3 pip3
+          ln -s python3.9 python3
+          ln -s pip3.9 pip3
       - name: Bootstrap
         run: |
           python3 -m pip install --upgrade pip virtualenv

.github/workflows/nightly.yml

@@ -39,6 +39,15 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 2
+      # TODO: Remove this step when the compatibility issue between mozjs and
+      #       Homebrew's Python 3.10 formula (servo/rust-mozjs#559) is fixed
+      - name: Select Python 3.9
+        run: |
+          brew install python@3.9
+          cd $(dirname $(which python3.9))
+          rm -f python3 pip3
+          ln -s python3.9 python3
+          ln -s pip3.9 pip3
       - name: Bootstrap
         run: |
           python3 -m pip install --upgrade pip virtualenv

python/requirements.txt

@@ -6,7 +6,7 @@ distro == 1.4
 mozdebug == 0.3
 mozinfo == 1.2.1
 mozlog == 7.1.0
-setuptools == 60.8.1
+setuptools == 65.3.0
 toml == 0.9.2
 
 # For Python linting