From f305bdb546a8f1a010d1d3c0dc05875d22ce0ec9 Mon Sep 17 00:00:00 2001 From: Matti Picus Date: Sat, 22 Jul 2023 06:02:28 +0200 Subject: [PATCH 1/2] fix typo --- docs/examples/quickstart/quickstart.c | 2 +- hpy/devel/include/hpy/hpymodule.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/examples/quickstart/quickstart.c b/docs/examples/quickstart/quickstart.c index d437bc4f3..ce9542046 100644 --- a/docs/examples/quickstart/quickstart.c +++ b/docs/examples/quickstart/quickstart.c @@ -35,5 +35,5 @@ static HPyModuleDef quickstart_def = { // The Python interpreter will create the module for us from the // HPyModuleDef specification. Additional initialization can be -// done in the HPy_mod_execute slot +// done in the HPy_mod_exec slot HPy_MODINIT(quickstart, quickstart_def) diff --git a/hpy/devel/include/hpy/hpymodule.h b/hpy/devel/include/hpy/hpymodule.h index 324e9ea6d..1ad5802aa 100644 --- a/hpy/devel/include/hpy/hpymodule.h +++ b/hpy/devel/include/hpy/hpymodule.h @@ -119,7 +119,7 @@ typedef struct { * structure that will serve as a specification of the module that should be * created by the interpreter. HPy supports only multi-phase module * initialization (PEP 451). Any module initialization code can be added - * to the HPy_mod_execute slot of the module if needed. + * to the HPy_mod_exec slot of the module if needed. * * Example: * From 25989222d9cc78cab9906e46847a86f076c37258 Mon Sep 17 00:00:00 2001 From: Matti Picus Date: Sun, 23 Jul 2023 07:37:46 +0200 Subject: [PATCH 2/2] copy python2 setup from cython --- .github/workflows/ci.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c60fea713..1da03c460 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -322,10 +322,16 @@ jobs: # parameters: # pythonVersion: "2.7" - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: '2.7' + - name: Set up Python2 + # Copied from cython's ci.yml + run: | + sudo ln -fs python2 /usr/bin/python + sudo apt-get update + sudo apt-get install python-setuptools python2.7 python2.7-dev + curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py + sudo python2 get-pip.py + ls -l /usr/bin/pip* /usr/local/bin/pip* + which pip - name: Install/Upgrade Python dependencies run: python -m pip install --upgrade pip wheel