Skip to content

Commit 824abcf

Browse files
committed
Merge branch 'PYTHON-5157' of github.com:blink1073/mongo-python-driver into PYTHON-5157
2 parents 352b047 + db30a35 commit 824abcf

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

.evergreen/scripts/setup-dev-env.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,18 @@ if [ -z "${PYMONGO_BIN_DIR:-}" ]; then
4343
export PATH="$PATH:$HOME/.local/bin"
4444
fi
4545

46+
# Set up venv, making sure c extensions build unless disabled.
47+
if [ -z "${NO_EXT:-}" ]; then
48+
export PYMONGO_C_EXT_MUST_BUILD=1
49+
fi
50+
# Set up visual studio env on Windows spawn hosts.
51+
if [ -f $HOME/.visualStudioEnv.sh ]; then
52+
set +u
53+
SSH_TTY=1 source $HOME/.visualStudioEnv.sh
54+
set -u
55+
fi
4656
uv sync --frozen
47-
uv run --frozen --with pip pip install -e .
57+
4858
echo "Setting up python environment... done."
4959

5060
# Ensure there is a pre-commit hook if there is a git checkout.

.github/workflows/dist.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ jobs:
3434
# Github Actions doesn't support pairing matrix values together, let's improvise
3535
# https://github.com/github/feedback/discussions/7835#discussioncomment-1769026
3636
buildplat:
37-
- [ubuntu-20.04, "manylinux_x86_64", "cp3*-manylinux_x86_64"]
38-
- [ubuntu-20.04, "manylinux_aarch64", "cp3*-manylinux_aarch64"]
39-
- [ubuntu-20.04, "manylinux_ppc64le", "cp3*-manylinux_ppc64le"]
40-
- [ubuntu-20.04, "manylinux_s390x", "cp3*-manylinux_s390x"]
41-
- [ubuntu-20.04, "manylinux_i686", "cp3*-manylinux_i686"]
37+
- [ubuntu-latest, "manylinux_x86_64", "cp3*-manylinux_x86_64"]
38+
- [ubuntu-latest, "manylinux_aarch64", "cp3*-manylinux_aarch64"]
39+
- [ubuntu-latest, "manylinux_ppc64le", "cp3*-manylinux_ppc64le"]
40+
- [ubuntu-latest, "manylinux_s390x", "cp3*-manylinux_s390x"]
41+
- [ubuntu-latest, "manylinux_i686", "cp3*-manylinux_i686"]
4242
- [windows-2019, "win_amd6", "cp3*-win_amd64"]
4343
- [windows-2019, "win32", "cp3*-win32"]
4444
- [macos-14, "macos", "cp*-macosx_*"]

.github/workflows/test-python.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
strategy:
5656
fail-fast: false
5757
matrix:
58-
os: [ubuntu-20.04]
58+
os: [ubuntu-latest]
5959
python-version: ["3.9", "pypy-3.10", "3.13", "3.13t"]
6060
name: CPython ${{ matrix.python-version }}-${{ matrix.os }}
6161
steps:

0 commit comments

Comments
 (0)