From 7ccc5cedb547e110c1c6f8a3599c6b77a6934c08 Mon Sep 17 00:00:00 2001
From: Ronan Lamy <ronan.lamy@gmail.com>
Date: Tue, 23 Feb 2021 19:21:45 +0000
Subject: [PATCH 1/2] Update HPy

---
 numpy/core/src/multiarray/arrayobject.c | 1 +
 pyproject.toml                          | 2 +-
 test_requirements.txt                   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/numpy/core/src/multiarray/arrayobject.c b/numpy/core/src/multiarray/arrayobject.c
index 4ec37507a70f..7e4f18b2df75 100644
--- a/numpy/core/src/multiarray/arrayobject.c
+++ b/numpy/core/src/multiarray/arrayobject.c
@@ -1833,4 +1833,5 @@ NPY_NO_EXPORT HPyType_Spec PyArray_Type_spec = {
     .flags = (HPy_TPFLAGS_DEFAULT | HPy_TPFLAGS_BASETYPE),
     .defines = array_defines,
     .legacy_slots = PyArray_Type_slots,
+    .legacy = true,
 };
diff --git a/pyproject.toml b/pyproject.toml
index af47761b95e8..272a27462f70 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ requires = [
     "setuptools<49.2.0",
     "wheel<=0.35.1",
     "Cython>=0.29.21,<3.0",  # Note: keep in sync with tools/cythonize.py
-    "hpy.devel @ git+https://github.com/hpyproject/hpy.git@5953dc7d4d8fd8c5179c75bded3ff514ffde4323#egg=hpy.devel"
+    "hpy.devel @ git+https://github.com/hpyproject/hpy.git@2a494355757e98a4187f88255aafd524fc632f78#egg=hpy.devel"
 ]
 
 
diff --git a/test_requirements.txt b/test_requirements.txt
index e5fac1842a6d..b87bbb7e1d28 100644
--- a/test_requirements.txt
+++ b/test_requirements.txt
@@ -14,4 +14,4 @@ cffi
 mypy==0.790; platform_python_implementation != "PyPy"
 typing_extensions
 # HPy
-git+https://github.com/hpyproject/hpy.git@5953dc7d4d8fd8c5179c75bded3ff514ffde4323#egg=hpy.devel
+git+https://github.com/hpyproject/hpy.git@2a494355757e98a4187f88255aafd524fc632f78#egg=hpy.devel

From d4219ed292d41ef7dbd43a06ef603f5ed1f23564 Mon Sep 17 00:00:00 2001
From: Ronan Lamy <ronan.lamy@gmail.com>
Date: Tue, 23 Feb 2021 19:28:29 +0000
Subject: [PATCH 2/2] Re-enable VLA exclusion

---
 tools/travis-test.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/travis-test.sh b/tools/travis-test.sh
index 9c68e7bfd184..6d8d147572f0 100755
--- a/tools/travis-test.sh
+++ b/tools/travis-test.sh
@@ -25,8 +25,7 @@ if [ -n "$PYTHON_OPTS" ]; then
 fi
 
 # make some warnings fatal, mostly to match windows compilers
-# werrors="-Werror=vla -Werror=nonnull -Werror=pointer-arith"
-werrors="-Werror=nonnull -Werror=pointer-arith"
+werrors="-Werror=vla -Werror=nonnull -Werror=pointer-arith"
 werrors="$werrors -Werror=implicit-function-declaration"
 
 # build with c99 by default