Skip to content

Commit

Permalink
skip 3.12
Browse files Browse the repository at this point in the history
  • Loading branch information
pmp-p committed Oct 10, 2024
1 parent 6a8f557 commit dca09dc
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
build:
runs-on: ubuntu-22.04
env:
BUILDS: 3.12 3.13 3.14
BUILDS: 3.13 3.14
EMFLAVOUR: tot

steps:
Expand Down
4 changes: 3 additions & 1 deletion config
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,9 @@ export NIMSDK=${NIMSDK:-"${SDKROOT}/nimsdk"}
# EXTRABINS="$EXTRABINS $NIMSDK/bin"

# ================ go =====================

export GOPRIVATE=*
export GONOPROXY=*
export GONOSUMDB=*
export GOMODCACHE=$XDG_CACHE_HOME
export GOPATH=$SDKROOT/go
export GOROOT=$SDKROOT/go
Expand Down
17 changes: 12 additions & 5 deletions scripts/cpython-build-emsdk-prebuilt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,19 @@ PIP="${SDKROOT}/python3-wasm -m pip"
$HPIP install \
trove-classifiers pluggy pathspec packaging hatchling \
typing_extensions mypy_extensions pyproject_hooks pyproject-metadata \
build pyparsing packaging hatchling setuptools_scm meson-python \
build pyparsing packaging hatchling setuptools_scm \
docutils setuptools meson meson-python \
idna urllib3 charset_normalizer certifi tomli requests flit pip


# all needed for PEP722/723, hpy, cffi modules and wheel building
# those may contain tiny fixes for wasm and/or current unreleased cpython.

for module in /data/git/flit/flit_core \
pushd src
git clone --no-tags --depth 1 --single-branch --branch main https://github.com/pygame-web/flit
popd

for module in src/flit/flit_core \
git+https://github.com/pygame-web/wheel \
git+https://github.com/pygame-web/setuptools \
git+https://github.com/python-cffi/cffi \
Expand Down Expand Up @@ -59,12 +65,13 @@ then
"
# $HPIP install setuptools
$HPIP install --upgrade --no-build-isolation --force git+https://github.com/pygame-web/cython.git
# compiling cython is way too slow so just get it pure with NO_CYTHON_COMPILE=true
NO_CYTHON_COMPILE=true $HPIP install --upgrade --no-build-isolation --force git+https://github.com/pygame-web/cython.git
else
# cython get the latest release on gh install on both host python and build python
pushd build
wget -q -c https://github.com/cython/cython/releases/download/${CYTHON_REL}/${CYTHON_WHL}
$HPIP install --upgrade $CYTHON_WHL
wget -q -c https://github.com/cython/cython/releases/download/${CYTHON_REL}/${CYTHON_WHL}
$HPIP install --upgrade $CYTHON_WHL
popd
$PIP install build/$CYTHON_WHL
fi
Expand Down
2 changes: 1 addition & 1 deletion scripts/cpython-build-emsdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ END
# prevent an error in install when byte compiling is disabled.
mkdir -p ${ROOT}/devices/emsdk/usr/lib/python${PYMAJOR}.${PYMINOR}/lib-dynload/__pycache__

emmake make -j$NPROC WASM_ASSETS_DIR=$(realpath ${PYTHONPYCACHEPREFIX}/empty)@/ || exit 255
emmake make -j$(nproc) WASM_ASSETS_DIR=$(realpath ${PYTHONPYCACHEPREFIX}/empty)@/ || exit 255
sed -i 's| -lcrypto||g' Makefile
emmake make -j1 Modules/_ctypes/_ctypes.o
if emmake make WASM_ASSETS_DIR=$(realpath ${PYTHONPYCACHEPREFIX}/empty)@/ install
Expand Down

0 comments on commit dca09dc

Please sign in to comment.