Merge branch 'master' of github.com:mongodb/mongo-python-driver

Author: blink1073

.evergreen/build-mac.sh

@@ -786,92 +786,6 @@ functions:
         args:
           - ${DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh
 
-  "build release":
-    - command: shell.exec
-      type: test
-      params:
-        working_dir: "src"
-        script: |
-          ${PREPARE_SHELL}
-          set -o xtrace
-          VERSION=${VERSION} ENSURE_UNIVERSAL2=${ENSURE_UNIVERSAL2} .evergreen/release.sh
-
-  "upload release":
-    - command: ec2.assume_role
-      params:
-        role_arn: ${assume_role_arn}
-    - command: archive.targz_pack
-      params:
-        target: "release-files.tgz"
-        source_dir: "src/dist"
-        include:
-          - "*"
-    - command: s3.put
-      params:
-        aws_key: ${AWS_ACCESS_KEY_ID}
-        aws_secret: ${AWS_SECRET_ACCESS_KEY}
-        aws_session_token: ${AWS_SESSION_TOKEN}
-        local_file: release-files.tgz
-        remote_file: release/${revision}/${task_id}-${execution}-release-files.tar.gz
-        bucket: ${bucket_name}
-        permissions: public-read
-        content_type: ${content_type|application/gzip}
-        display_name: Release files
-
-  "download and merge releases":
-    - command: ec2.assume_role
-      params:
-        role_arn: ${assume_role_arn}
-    - command: shell.exec
-      params:
-        silent: true
-        include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
-        script: |
-          # Download all the task coverage files.
-          aws s3 cp --recursive s3://${bucket_name}/release/${revision}/ release/
-    - command: shell.exec
-      params:
-        shell: "bash"
-        script: |
-          ${PREPARE_SHELL}
-          set -o xtrace
-          # Combine releases into one directory.
-          ls -la release/
-          mkdir releases
-          # Copy old manylinux release first since we want the newer manylinux
-          # wheels to override them.
-          mkdir old_manylinux
-          if mv release/*old_manylinux* old_manylinux; then
-            for REL in old_manylinux/*; do
-              tar zxvf $REL -C releases/
-            done
-          fi
-          for REL in release/*; do
-            tar zxvf $REL -C releases/
-          done
-          # Build source distribution.
-          cd src/
-          /opt/python/3.8/bin/python3 -m pip install build
-          /opt/python/3.8/bin/python3 -m build --sdist .
-          cp dist/* ../releases
-    - command: archive.targz_pack
-      params:
-        target: "release-files-all.tgz"
-        source_dir: "releases/"
-        include:
-          - "*"
-    - command: s3.put
-      params:
-        aws_key: ${AWS_ACCESS_KEY_ID}
-        aws_secret: ${AWS_SECRET_ACCESS_KEY}
-        aws_session_token: ${AWS_SESSION_TOKEN}
-        local_file: release-files-all.tgz
-        remote_file: release-all/${revision}/${task_id}-${execution}-release-files-all.tar.gz
-        bucket: ${bucket_name}
-        permissions: public-read
-        content_type: ${content_type|application/gzip}
-        display_name: Release files all
-
   "run perf tests":
     - command: shell.exec
       type: test
@@ -1116,72 +1030,6 @@ tasks:
                genhtml --version || true
                valgrind --version || true
 
-    - name: "release-mac"
-      tags: ["release_tag"]
-      run_on: macos-11
-      commands:
-        - func: "build release"
-          vars:
-              VERSION: "3.12"
-              ENSURE_UNIVERSAL2: "1"
-        - func: "build release"
-          vars:
-              VERSION: "3.11"
-              ENSURE_UNIVERSAL2: "1"
-        - func: "build release"
-          vars:
-              VERSION: "3.10"
-              ENSURE_UNIVERSAL2: "1"
-        - func: "build release"
-          vars:
-              VERSION: "3.9"
-              ENSURE_UNIVERSAL2: "1"
-        - func: "upload release"
-        - func: "build release"
-          vars:
-              VERSION: "3.8"
-        - func: "upload release"
-
-    - name: "release-windows"
-      tags: ["release_tag"]
-      run_on: windows-64-vsMulti-small
-      commands:
-        - func: "build release"
-        - func: "upload release"
-
-    - name: "release-manylinux"
-      tags: ["release_tag"]
-      run_on: ubuntu2204-large
-      exec_timeout_secs: 216000  # 60 minutes (manylinux task is slow).
-      commands:
-        - func: "build release"
-        - func: "upload release"
-
-    - name: "release-old-manylinux"
-      tags: ["release_tag"]
-      run_on: ubuntu2204-large
-      exec_timeout_secs: 216000  # 60 minutes (manylinux task is slow).
-      commands:
-        - command: shell.exec
-          type: test
-          params:
-            working_dir: "src"
-            script: |
-              ${PREPARE_SHELL}
-              set -o xtrace
-              .evergreen/build-manylinux.sh BUILD_WITH_TAG
-        - func: "upload release"
-
-    - name: "release-combine"
-      tags: ["release_tag"]
-      run_on: rhel84-small
-      depends_on:
-        - name: "*"
-          variant: ".release_tag"
-          patch_optional: true
-      commands:
-        - func: "download and merge releases"
-
 # Standard test tasks {{{
 
     - name: "mockupdb"
@@ -3177,13 +3025,6 @@ buildvariants:
   tasks:
     - name: "check-import-time"
 
-- name: Release
-  display_name: Release
-  batchtime: 20160 # 14 days
-  tags: ["release_tag"]
-  tasks:
-  - ".release_tag"
-
 - name: "perf-tests"
   display_name: "Performance Benchmark Tests"
   batchtime: 10080  # 7 days

.evergreen/build-manylinux-internal.sh

@@ -13,8 +13,11 @@ if $PYTHON_BINARY -m hatch --version; then
       $PYTHON_BINARY -m hatch run "$@"
     }
 else # No toolchain hatch present, set up virtualenv before installing hatch
-    createvirtualenv "$PYTHON_BINARY" hatchenv
-    trap "deactivate; rm -rf hatchenv" EXIT HUP
+    # Use a random venv name because the encryption tasks run this script multiple times in the same run.
+    ENV_NAME=hatchenv-$RANDOM
+    createvirtualenv "$PYTHON_BINARY" $ENV_NAME
+    # shellcheck disable=SC2064
+    trap "deactivate; rm -rf $ENV_NAME" EXIT HUP
     python -m pip install -q hatch
     run_hatch() {
       python -m hatch run "$@"

.evergreen/build-manylinux.sh

@@ -43,7 +43,7 @@ find_python3() {
 createvirtualenv () {
     PYTHON=$1
     VENVPATH=$2
-    rm -rf $VENVPATH
+
     # Prefer venv
     VENV="$PYTHON -m venv"
     if [ "$(uname -s)" = "Darwin" ]; then

.evergreen/build-windows.sh

@@ -78,9 +78,6 @@ jobs:
       - name: Run tests
         run: |
           hatch run test:test
-      - name: Run async tests
-        run: |
-          hatch run test:test-async
 
   doctest:
     runs-on: ubuntu-latest