Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CLIENT-2287] Add support for PyPy 3.10 #681

Draft
wants to merge 4 commits into
base: dev
Choose a base branch
from
Draft

[CLIENT-2287] Add support for PyPy 3.10 #681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d200c1
build pp310
juliannguyen4 Oct 10, 2024
0127737
allow choosing python version
juliannguyen4 Oct 10, 2024
d049542
fix
juliannguyen4 Oct 10, 2024
c5109fd
update
juliannguyen4 Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions .github/workflows/build-wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ on:
type: string
description: Valid JSON list of Python tags to build the client for
required: false
default: '["cp38", "cp39", "cp310", "cp311", "cp312"]'
default: '["cp38", "cp39", "cp310", "cp311", "cp312", "pp310"]'
platform-tag:
description: Platform to build the client for.
type: choice
Expand Down Expand Up @@ -76,7 +76,7 @@ on:
python-tags:
type: string
required: false
default: '["cp38", "cp39", "cp310", "cp311", "cp312"]'
default: '["cp38", "cp39", "cp310", "cp311", "cp312", "pp310"]'
platform-tag:
type: string
required: true
Expand Down Expand Up @@ -316,7 +316,14 @@ jobs:
# The command used in GNU sed is different than in macOS sed
run: |
PYTHON_TAG=${{ matrix.python-tag }}
PYTHON_VERSION="${PYTHON_TAG/cp/}"
if [[ $PYTHON_TAG == pp* ]]; then
PREFIX_TO_REPLACE=pp
NEW_PREFIX=pypy
else
PREFIX_TO_REPLACE=cp
NEW_PREFIX=""
fi
PYTHON_VERSION="${PYTHON_TAG/$PREFIX_TO_REPLACE/$NEW_PREFIX}"
echo PYTHON_VERSION="${PYTHON_VERSION/3/3.}" >> $GITHUB_ENV
shell: bash

Expand Down
29 changes: 25 additions & 4 deletions .github/workflows/valgrind.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,16 @@ on:
description: 'Use massif for testing memory usage'
required: false
default: false
python-tag:
type: string
required: false
default: cp38

jobs:
build-manylinux-wheel:
uses: ./.github/workflows/build-wheels.yml
with:
python-tags: '["cp38"]'
python-tags: '["${{ inputs.python-tag }}"]'
platform-tag: manylinux_x86_64
sha-to-build-and-test: ${{ github.sha }}
secrets: inherit
Expand All @@ -38,14 +42,31 @@ jobs:
submodules: recursive
fetch-depth: 0

- uses: actions/setup-python@v2
# TODO: create helper func
- name: Convert Python tag to Python version
# Don't use sed because we want this command to work on both mac and windows
# The command used in GNU sed is different than in macOS sed
run: |
PYTHON_TAG=${{ inputs.python-tag }}
if [[ $PYTHON_TAG == pp* ]]; then
PREFIX_TO_REPLACE=pp
NEW_PREFIX=pypy
else
PREFIX_TO_REPLACE=cp
NEW_PREFIX=""
fi
PYTHON_VERSION="${PYTHON_TAG/$PREFIX_TO_REPLACE/$NEW_PREFIX}"
echo PYTHON_VERSION="${PYTHON_VERSION/3/3.}" >> $GITHUB_ENV
shell: bash

- uses: actions/setup-python@v5
with:
python-version: '3.8'
python-version: ${{ env.PYTHON_VERSION }}
architecture: 'x64'

- uses: actions/download-artifact@v4
with:
name: cp38-manylinux_x86_64.build
name: ${{ inputs.python-tag }}-manylinux_x86_64.build

- name: Install client
run: pip install ./*.whl
Expand Down
Loading